Hello community, here is the log from the commit of package suseRegister checked in at Mon Oct 30 17:50:42 CET 2006. -------- --- suseRegister/suseRegister.changes 2006-10-25 13:40:16.000000000 +0200 +++ /mounts/work_src_done/NOARCH/suseRegister/suseRegister.changes 2006-10-30 15:44:51.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 15:40:03 CET 2006 - mc@suse.de + +- got texts from proofread + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.v3BulJ/_old 2006-10-30 17:49:26.000000000 +0100 +++ /var/tmp/diff_new_pack.v3BulJ/_new 2006-10-30 17:49:26.000000000 +0100 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.1 -Release: 14 +Release: 15 Summary: Registration Tool Group: Productivity/Other License: GNU General Public License (GPL) - all versions @@ -66,6 +66,8 @@ /usr/lib/suseRegister/bin/* %changelog -n suseRegister +* Mon Oct 30 2006 - mc@suse.de +- got texts from proofread * Wed Oct 25 2006 - mc@suse.de - fix "Registration insists on hardware profile" [#214722] * Tue Oct 24 2006 - mc@suse.de ++++++ suseRegister-1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.1/suse_register new/suseRegister-1.1/suse_register --- old/suseRegister-1.1/suse_register 2006-10-25 13:38:34.000000000 +0200 +++ new/suseRegister-1.1/suse_register 2006-10-30 15:38:33.000000000 +0100 @@ -215,7 +215,7 @@ if(-e "$configFile") { open(CNF, "< $configFile") or do { - logPrintExit("cannot open file $configFile: $!\n", 12); + logPrintExit("Cannot open file $configFile: $!\n", 12); }; while(<CNF>) @@ -271,7 +271,7 @@ } open(ZMD, "< $GUID_FILE") or do { - logPrintExit("cannot open file $GUID_FILE: $!\n", 12); + logPrintExit("Cannot open file $GUID_FILE: $!\n", 12); }; $guid = <ZMD>; @@ -335,7 +335,7 @@ open(SYSC, "< $SYSCONFIG_CLOCK") or do { - logPrintExit("cannot open file $SYSCONFIG_CLOCK: $!\n", 12); + logPrintExit("Cannot open file $SYSCONFIG_CLOCK: $!\n", 12); }; while(<SYSC>) { @@ -366,7 +366,7 @@ if (!defined $command || $command eq "") { - logPrintExit("No command.\n", 14); + logPrintExit("Missing command.\n", 14); } if ($command =~ /^hwinfo\s*(.*)\s*$/) @@ -381,7 +381,7 @@ } elsif($mandatory) { - logPrintExit("Mandatory hardware data cannot be supplied because --no-hw-data was given.\n", + logPrintExit("Mandatory hardware data cannot be supplied because the option --no-hw-data was given.\n", 3); } else @@ -417,7 +417,7 @@ { $cmd = undef; open(SEC, "< $SECRET_FILE") or do { - logPrintExit("cannot open file $SECRET_FILE: $!\n", 12); + logPrintExit("Cannot open file $SECRET_FILE: $!\n", 12); }; while(<SEC>) { @@ -525,7 +525,7 @@ if (! defined $tree) { - logPrintExit("No data\n", 14); + logPrintExit("Missing data.\n", 14); } print STDERR "LOGIC: $logic\n" if($debug >= 3); @@ -667,7 +667,7 @@ if (! defined $tree) { - logPrintExit("No data.\n",14); + logPrintExit("Missing data.\n",14); } #print Data::Dumper->Dump([$tree])."\n"; @@ -716,7 +716,7 @@ if (!defined $tree) { - logPrintExit("No data.\n", 14); + logPrintExit("Missing data.\n", 14); } foreach my $kid (@$tree) @@ -919,22 +919,22 @@ if (! defined $url) { - logPrintExit("Cannot send data. Missing URL.\n", 14); + logPrintExit("Cannot send data to registration server. Missing URL.\n", 14); } if($url =~ /^-/) { - logPrintExit("Wrong protocol($url).\n", 15); + logPrintExit("Invalid protocol($url).\n", 15); } my $uri = URI->new($url); if(!defined $uri->host || $uri->host !~ /$initialDomain$/) { - logPrintExit("Wrong URL($url).\n", 15); + logPrintExit("Invalid URL($url). Data could only be send to $initialDomain .\n", 15); } if(!defined $uri->scheme || $uri->scheme ne "https") { - logPrintExit("Wrong protocol($url).\n", 15); + logPrintExit("Invalid protocol($url). https is required.\n", 15); } $url = $uri->as_string; @@ -1056,7 +1056,7 @@ { if ($redirects > 5) { - logPrintExit("Too many redirects\n", 5); + logPrintExit("Too many redirects. Aborting.\n", 5); } $redirects++; @@ -1152,7 +1152,7 @@ { $text .= "Available Options:\n\n"; $text .= "You can add these options to suse_register with the -a option.\n"; - $text .= "-a can be used multiple times\n\n"; + $text .= "'-a' can be used multiple times\n\n"; } my $p = new XML::Parser(Style => 'Objects', Pkg => 'SR'); @@ -1163,7 +1163,7 @@ if (! defined $tree || ref($tree->[0]) ne "SR::paramlist" || ! exists $tree->[0]->{Kids} || ref($tree->[0]->{Kids}) ne "ARRAY") { - logPrintExit("Unknown format. Cannot show human readable output. Try --xml-output.\n". + logPrintExit("Invalid XML format. Cannot show human readable output. Try --xml-output.\n". 6); } @@ -1237,7 +1237,7 @@ if(!$yastcall) { $text .= "Example:\n"; - $text .= " suse_register -a username=\"tux\"\n"; + $text .= " suse_register -a email=\"tux\@example.com\"\n"; } else { @@ -1333,19 +1333,19 @@ { if(!-d "/etc/zmd") { - mkdir "/etc/zmd" or logPrintExit("cannot create directory /etc/zmd: $!\n", 12); + mkdir "/etc/zmd" or logPrintExit("Cannot create directory /etc/zmd: $!\n", 12); } my $guid = `$createGuid 2>/dev/null`; if(!defined $guid || $guid eq "") { - logPrintExit("Cannot create guid", 13); + logPrintExit("Cannot create guid. Command '$createGuid' failed.", 13); } chomp $guid; $guid =~ s/-//g; # remove the - open(ZMD, "> $GUID_FILE") or do { - logPrintExit("cannot open file $GUID_FILE for write: $!\n", 12); + logPrintExit("Cannot open file $GUID_FILE for write: $!\n", 12); }; print ZMD $guid; close ZMD; @@ -1877,7 +1877,7 @@ if (!defined $tree) { - logPrintExit("No data.\n", 14); + logPrintExit("Missing data.\n", 14); } #print Data::Dumper->Dump([$tree]); @@ -1941,7 +1941,7 @@ { my $secret = ""; open(SEC, "< $SECRET_FILE") or do { - logPrintExit("cannot open file $SECRET_FILE: $!\n", 12); + logPrintExit("Cannot open file $SECRET_FILE: $!\n", 12); }; while(<SEC>) { @@ -2098,7 +2098,8 @@ if($res eq $lastResponse) { - logPrintExit("Got the same server response as the last time. Aborting.\n", 9); + # Got the same server response as the last time + logPrintExit("Invalid response from the registration server. Aborting.\n", 9); } $lastResponse = $res; @@ -2169,7 +2170,7 @@ if(!$yastcall) { unshift @registerReadableText, - "To complete the registration please provide some additional parameters:\n\n"; + "To complete the registration, provide some additional parameters:\n\n"; push @registerReadableText, "\nYou can provide these parameters with the '-a' option.\n"; push @registerReadableText, "You can use the '-a' option multiple times.\n\n"; @@ -2272,8 +2273,8 @@ { print STDERR "register(browser): ".(tv_interval($t0))."\n" if($time); - logPrintExit("If you have finished your registration, ". - "please start suse_register\n". + logPrintExit("When you have finished your registration, ". + "start suse_register\n". "again to get the current configuration for ". "the update mechanism.\n", 0); } @@ -2378,7 +2379,7 @@ if (! defined $tree || ref($tree->[0]) ne "SR::productlist") { - logPrintExit("Unknown format. Cannot show human readable output. Try --xml-output.\n". + logPrintExit("Unknown XML format. Cannot show human readable output. Try --xml-output.\n". 6); } @@ -2415,7 +2416,7 @@ print STDERR " --product <product> product to register\n"; print STDERR " You can use this option multiple times.\n"; print STDERR " -n [--no-optional] do not send optional data\n"; - print STDERR " -f [--force-registration] mark all parameters mandatory which are required\n"; + print STDERR " -f [--force-registration] mark all required parameters mandatory\n"; print STDERR " for registration even though registration itself\n"; print STDERR " might be optional\n"; print STDERR " --no-hw-data do not send hardware data, even if they are mandatory\n"; @@ -2430,12 +2431,12 @@ print STDERR "\n"; print STDERR " -p [--list-parameters] show list of parameters\n\n"; print STDERR " --xml-output print XML output\n"; - print STDERR " -L [--log] <file> log all networktraffic to <file>\n"; - print STDERR " [--no-proxy] do not use proxie's\n"; + print STDERR " -L [--log] <file> log all network traffic to <file>\n"; + print STDERR " [--no-proxy] do not use proxies\n"; print STDERR " --locale=<locale> define a locale e.g. en-US.utf-8\n\n"; print STDERR "Example:\n\n"; - print STDERR " suse_register.pl -n -a email=company\@example.com -a companyID=03474hdkndg3934957340\n"; + print STDERR " suse_register.pl -n -a email=company\@example.com -a regcode-sles=03474hdkndg3934957340\n"; print STDERR "\n"; exit 2; } @@ -2499,7 +2500,7 @@ if(!-e $querypool) { - logPrintExit("query-pool not found\n", 12); + logPrintExit("query-pool command not found.\n", 12); } } } @@ -2634,7 +2635,7 @@ if(@$products == 0) { - logPrintExit("No products to register\n", 100); + logPrintExit("None of the installed products can be registered at the Novell registration server.\n", 100); } my $ret = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org