Hello community, here is the log from the commit of package iproute2 for openSUSE:11.4 checked in at Tue Jul 26 17:11:49 CEST 2011.
-------- --- old-versions/11.4/all/iproute2/iproute2.changes 2011-01-12 17:03:48.000000000 +0100 +++ 11.4/iproute2/iproute2.changes 2011-07-25 09:08:14.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.4/all/iproute2 Destination is old-versions/11.4/UPDATES/all/iproute2 calling whatdependson for 11.4-i586 New: ---- iproute2-correct-error-code.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.y0X791/_old 2011-07-26 17:11:25.000000000 +0200 +++ /var/tmp/diff_new_pack.y0X791/_new 2011-07-26 17:11:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iproute2 (Version 2.6.37) +# spec file for package iproute2 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: Productivity/Networking/Routing Provides: iproute Version: 2.6.37 -Release: 1 +Release: 4.<RELEASE5> %define rversion 2.6.37 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ @@ -40,6 +40,7 @@ Patch10: %name-2.6.29-1-ss-pclose.diff Patch13: %name-2.6.29-1-memleak.diff Patch14: %name-2.6.37-rtt-metrics-units.diff +Patch15: %name-correct-error-code.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -86,6 +87,7 @@ %patch10 %patch13 %patch14 -p1 +%patch15 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build ++++++ iproute2-correct-error-code.patch ++++++ Index: iproute2-2.6.37/ip/ip.c =================================================================== --- iproute2-2.6.37.orig/ip/ip.c +++ iproute2-2.6.37/ip/ip.c @@ -143,6 +143,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) @@ -245,17 +246,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
