Hello community, here is the log from the commit of package iproute2 for openSUSE:11.3 checked in at Tue Jul 26 17:02:44 CEST 2011.
-------- --- old-versions/11.3/all/iproute2/iproute2.changes 2010-02-23 23:46:01.000000000 +0100 +++ 11.3/iproute2/iproute2.changes 2011-07-25 09:17:25.000000000 +0200 @@ -1,0 +2,6 @@ +------------------------------------------------------------------- +Mon Jul 25 07:09:15 UTC 2011 - b...@suse.com + +- Add iproute2-correct-error-code.patch to fix return error code + (bnc#681952, swampid#41543). + Package does not exist at destination yet. Using Fallback old-versions/11.3/all/iproute2 Destination is old-versions/11.3/UPDATES/all/iproute2 calling whatdependson for 11.3-i586 New: ---- iproute2-correct-error-code.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.cb8bns/_old 2011-07-26 17:02:01.000000000 +0200 +++ /var/tmp/diff_new_pack.cb8bns/_new 2011-07-26 17:02:01.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package iproute2 (Version 2.6.29.1) +# spec file for package iproute2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Provides: iproute AutoReqProv: on Version: 2.6.29.1 -Release: 8 +Release: 13.<RELEASE2> %define rversion 2.6.29-1 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ @@ -45,6 +45,7 @@ Patch12: %name-2.6.29-1-typelabels.diff Patch13: %name-2.6.29-1-memleak.diff Patch14: iproute-arphrd-none.diff +Patch15: %name-correct-error-code.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnetlink-devel @@ -88,6 +89,7 @@ %patch12 %patch13 %patch14 -p1 +%patch15 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build ++++++ iproute2-correct-error-code.patch ++++++ Index: iproute2-2.6.29-1/ip/ip.c =================================================================== --- iproute2-2.6.29-1.orig/ip/ip.c +++ iproute2-2.6.29-1/ip/ip.c @@ -141,6 +141,7 @@ static int batch(const char *name) int main(int argc, char **argv) { char *basename; + int ret = 0; basename = strrchr(argv[0], '/'); if (basename == NULL) @@ -224,17 +225,29 @@ int main(int argc, char **argv) _SL_ = oneline ? "\\" : "\n" ; - if (batch_file) - return batch(batch_file); + if (batch_file) { + ret = batch(batch_file); + if(ret < 0) + ret = -ret; + exit(ret); + } if (rtnl_open(&rth, 0) < 0) exit(1); - if (strlen(basename) > 2) - return do_cmd(basename+2, argc, argv); + if (strlen(basename) > 2) { + ret = do_cmd(basename+2, argc, argv); + if(ret < 0) + ret = -ret; + exit(ret); + } - if (argc > 1) - return do_cmd(argv[1], argc-1, argv+1); + if (argc > 1) { + ret = do_cmd(argv[1], argc-1, argv+1); + if(ret < 0) + ret = -ret; + exit(ret); + } rtnl_close(&rth); usage(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
