From: Martin Vidner <mvidner@suse.cz>
Date: Thu, 30 Nov 2006 16:32:57 +0000 (+0000)
Subject: installation_sources: fixed to be compatible even with
X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~378
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66bd4e3ac7babfb179615ec3bc5cbef070a73d40;p=platform%2Fupstream%2Fzypper.git

installation_sources: fixed to be compatible even with
/opt/kde3/bin/kde_add_yast_source.sh (#223795).
---

diff --git a/package/zypper.changes b/package/zypper.changes
index 3e83004..10c5fec 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,6 +1,8 @@
 -------------------------------------------------------------------
-Thu Nov 30 17:05:36 CET 2006 - mvidner@suse.cz
+Thu Nov 30 17:32:35 CET 2006 - mvidner@suse.cz
 
+- installation_sources: fixed to be compatible even with
+  /opt/kde3/bin/kde_add_yast_source.sh (#223795).
 - Do not needlessly use libtool (#224738).
 - zypp-checkpatches does not need -lboost_program_options (#224764)
 
diff --git a/src/installation_sources b/src/installation_sources
index 254ec39..edf30df 100644
--- a/src/installation_sources
+++ b/src/installation_sources
@@ -3,8 +3,19 @@
 # that was in yast2-packagemanager.rpm
 
 ZYPPER=zypper
+
+# be even more compatible, #223795
+Zypper() {
+  $ZYPPER "$@" 2>&1
+  E=$?
+  if [ $E -gt 0 -a $E -lt 100 ]; then
+    echo ERROR
+  fi
+  exit $E
+}
+
 if [ "x$1" = "x-s" ]; then
-   exec $ZYPPER service-list
+   Zypper service-list
 fi
 
 if [ "x$1" = "x-e" ]; then
@@ -15,7 +26,7 @@ elif [ "x$1" = "x-d" ]; then
 fi
 
 if [ "x$1" = "x-a" -a -n "$2" ]; then
-   exec $ZYPPER service-add $ENABLED "$2"
+   Zypper service-add $ENABLED "$2"
 fi
 
 cat >&2 <<EOF