Hello community, here is the log from the commit of package suseRegister checked in at Tue Nov 18 14:25:32 CET 2008. -------- --- suseRegister/suseRegister.changes 2008-11-11 11:03:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/suseRegister/suseRegister.changes 2008-11-18 13:52:24.155851000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 18 13:49:53 CET 2008 - mc@suse.de + +- initialize GUID before calling zypper refresh +- if zypper refresh failed add a note to the error message about + the --no-refresh option. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.p20718/_old 2008-11-18 14:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.p20718/_new 2008-11-18 14:25:23.000000000 +0100 @@ -20,7 +20,7 @@ Name: suseRegister Version: 1.3 -Release: 11 +Release: 12 Summary: Registration Tool Group: Productivity/Other License: GPL v2 or later @@ -89,6 +89,10 @@ /usr/lib/suseRegister/bin/* %changelog +* 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 + the --no-refresh option. * Tue Nov 11 2008 mc@suse.de - do not remove old deviceid/secret files (bnc#442793) ++++++ suseRegister-1.3.tar.bz2 ++++++ 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-11 10:55:09.000000000 +0100 +++ new/suseRegister-1.3/SuseRegister.pm 2008-11-18 13:48:43.000000000 +0100 @@ -384,7 +384,15 @@ { $ctx->{xenstorechmod} = "/bin/xenstore-chmod"; } - + + # call this as soon as possible. + ($code, $msg) = SUSE::SRPrivate::initGUID($ctx); + if($code != 0) + { + SUSE::SRPrivate::logPrintError($ctx, $msg, $code); + return $ctx; + } + # # Call a refresh at the beginning, to be sure that we have a # complete an current state. @@ -394,20 +402,13 @@ my ($code, $message) = SUSE::SRPrivate::zyppRefresh($ctx); if($code != 0) { + $message .= "\nRefresh failed. You may want to try again with --no-refesh option."; $ctx->{errorcode} = $code; $ctx->{errormsg} = $message; return $ctx; } } - # call this as soon as possible. - ($code, $msg) = SUSE::SRPrivate::initGUID($ctx); - if($code != 0) - { - SUSE::SRPrivate::logPrintError($ctx, $msg, $code); - return $ctx; - } - ($code, $msg) = SUSE::SRPrivate::readSystemValues($ctx); if($code != 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org