![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package suseRegister
checked in at Fri Nov 21 15:52:58 CET 2008.
--------
--- suseRegister/suseRegister.changes 2008-11-18 13:52:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/suseRegister/suseRegister.changes 2008-11-21 14:42:09.609055000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 21 11:28:58 CET 2008 - mc@suse.de
+
+- fix registration workflow to cope better with temorary states of
+ NCC (bnc#446572)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suseRegister.spec ++++++
--- /var/tmp/diff_new_pack.C27275/_old 2008-11-21 15:51:55.000000000 +0100
+++ /var/tmp/diff_new_pack.C27275/_new 2008-11-21 15:51:55.000000000 +0100
@@ -20,7 +20,7 @@
Name: suseRegister
Version: 1.3
-Release: 12
+Release: 13
Summary: Registration Tool
Group: Productivity/Other
License: GPL v2 or later
@@ -89,6 +89,9 @@
/usr/lib/suseRegister/bin/*
%changelog
+* Fri Nov 21 2008 mc@suse.de
+- fix registration workflow to cope better with temorary states of
+ NCC (bnc#446572)
* Tue Nov 18 2008 mc@suse.de
- initialize GUID before calling zypper refresh
- if zypper refresh failed add a note to the error message about
++++++ suseRegister-1.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.3/SRPrivate.pm new/suseRegister-1.3/SRPrivate.pm
--- old/suseRegister-1.3/SRPrivate.pm 2008-11-18 13:48:43.000000000 +0100
+++ new/suseRegister-1.3/SRPrivate.pm 2008-11-21 14:41:14.000000000 +0100
@@ -729,7 +729,6 @@
$txt .= "\n";
}
push @{$ctx->{registerReadableText}}, $txt;
- $modified = 1;
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.3/suse_register new/suseRegister-1.3/suse_register
--- old/suseRegister-1.3/suse_register 2008-11-18 13:48:43.000000000 +0100
+++ new/suseRegister-1.3/suse_register 2008-11-21 14:41:14.000000000 +0100
@@ -35,7 +35,6 @@
my $norefresh = 0;
my $help = 0;
my $debug = 0;
-my $yastcall = 0;
my %args = (
processor => undef,
@@ -179,7 +178,6 @@
"browser|b=s" => \$browser,
"no-proxy" => \$noproxy,
"no-refresh" => \$norefresh,
- "yast|y" => \$yastcall,
"help|?|h" => \$help,
"debug|d=i" => \$debug,
"arg|a=s" => \%args,
@@ -205,7 +203,6 @@
$data->{restoreRepos} = $restoreRepos;
$data->{batch} = $batch;
$data->{noproxy} = $noproxy;
-$data->{yastcall} = $yastcall;
$data->{norefresh} = $norefresh;
$data->{debug} = $debug;
$data->{args} = \%args;
@@ -242,29 +239,16 @@
}
else
{
- $ret = SUSE::SuseRegister::register($ctx);
- if($ctx->{errorcode} != 0)
- {
- logPrintExit($ctx, $ctx->{errormsg}, $ctx->{errorcode});
- }
-
- #print Data::Dumper->Dump([$ctx])."\n";
-
-
- # clean lastResponse only in this case. When this register
- # call returns only interactive needinfos the next will fail.
$ctx->{lastResponse} = "";
-
-
- if($ret == 1)
+ do
{
$ret = SUSE::SuseRegister::register($ctx);
if($ctx->{errorcode} != 0)
{
logPrintExit($ctx, $ctx->{errormsg}, $ctx->{errorcode});
}
-
- if($ret == 1)
+
+ if($ret == 4)
{
if(!$interactive)
{
@@ -273,23 +257,17 @@
defined $ctx->{xmloutput})
{
print STDERR $ctx->{xmloutput};
-
- exit $ret;
+ }
+ elsif($batch)
+ {
+ mailToRoot($ctx, "Manual registration required",
+ join("", @{$ctx->{registerReadableText}})."\n");
}
else
{
- if($batch)
- {
- mailToRoot($ctx, "Manual registration required",
- join("", @{$ctx->{registerReadableText}})."\n");
- }
- else
- {
- print STDERR join("", @{$ctx->{registerReadableText}})."\n";
- print $ctx->{registerManuallyURL}."\n";
- }
- exit 1;
+ print STDERR join("", @{$ctx->{registerReadableText}})."\n";
}
+ exit 4;
}
else
{
@@ -398,13 +376,10 @@
# browser was called, so reset force-registration
$ctx->{forcereg} = 0;
-
- $ctx->{lastResponse} = "";
-
- $ret = SUSE::SuseRegister::register($ctx);
+ $ret = 1;
}
}
- }
+ } while ($ret == 1);
if($ret == 0)
{
@@ -413,7 +388,7 @@
defined $ctx->{xmloutput})
{
print STDERR $ctx->{xmloutput};
- exit $ret;
+ exit 0;
}
SUSE::SuseRegister::manageUpdateSources($ctx);
@@ -435,16 +410,6 @@
{
logPrintExit($ctx, $ctx->{errormsg}, $ret);
}
-
- if($ret == 0 && $yastcall)
- {
- foreach my $service (keys %{$ctx->{zmdConfig}})
- {
- next if($service eq "globalzmdoptions");
-
- print STDERR $ctx->{zmdConfig}->{$service}->{url}."\n";
- }
- }
}
print STDERR "total time: ".(tv_interval($programStartTime))."\n" if($ctx->{time});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.3/SuseRegister.pm new/suseRegister-1.3/SuseRegister.pm
--- old/suseRegister-1.3/SuseRegister.pm 2008-11-18 13:48:43.000000000 +0100
+++ new/suseRegister-1.3/SuseRegister.pm 2008-11-21 14:41:14.000000000 +0100
@@ -702,6 +702,10 @@
2 error - but it is better to test $ctx->{errorcode}
+ 3 error - mandatory hardware data required but --no-hw-data is given.
+
+ 4 needinfo which required manual interaction
+
Important values in the context are:
$ctx->{args} the arguments which will be send to the server - see I
participants (1)
-
root@Hilbert.suse.de