Hello community, here is the log from the commit of package suseRegister checked in at Wed Mar 7 21:27:52 CET 2007. -------- --- suseRegister/suseRegister.changes 2007-03-06 12:40:34.000000000 +0100 +++ /mounts/work_src_done/NOARCH/suseRegister/suseRegister.changes 2007-03-07 17:15:44.709472000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 7 17:14:51 CET 2007 - mc@suse.de + +- ignore "not found" errors on catalogDelete + [#252204] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.O23080/_old 2007-03-07 21:27:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O23080/_new 2007-03-07 21:27:47.000000000 +0100 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.2 -Release: 26 +Release: 27 Summary: Registration Tool Group: Productivity/Other License: GNU General Public License (GPL) @@ -95,6 +95,9 @@ %endif %changelog +* Wed Mar 07 2007 - mc@suse.de +- ignore "not found" errors on catalogDelete + [#252204] * Tue Mar 06 2007 - mc@suse.de - implement refresh to fix unknown catalogs after registration [#251634] ++++++ suseRegister-1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.2/SuseRegister.pm new/suseRegister-1.2/SuseRegister.pm --- old/suseRegister-1.2/SuseRegister.pm 2007-03-06 12:37:53.000000000 +0100 +++ new/suseRegister-1.2/SuseRegister.pm 2007-03-07 17:10:16.000000000 +0100 @@ -2029,7 +2029,8 @@ # A rug catalog is a zypp service - so call zyppServiceDelete ($code, $msg) = SUSE::SRPrivate::zyppServiceDelete($ctx, $catalog->{url}); - if($code != 0) + # code 32 is "not found" which can be ignored on delete + if($code != 0 && $code != 32) { $lastcode = $code; $lastmsg = $msg; ++++++ zypper_wrap ++++++ --- suseRegister/zypper_wrap 2007-03-06 12:40:34.000000000 +0100 +++ /mounts/work_src_done/NOARCH/suseRegister/zypper_wrap 2007-03-07 17:15:44.716455000 +0100 @@ -97,7 +97,7 @@ FILE=$(grep -l "<url>$(xml_escape "$ID")</url>" "$CHANDIR"/* ) if [ ! -f "$FILE" ]; then echo "Not found: $ID" >&2 - exit 1 + exit 2 fi fi # $FILE exists ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org