- Fix package-manager script to properly quote arguments. (bnc #30903)

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 9c3043c..9271d2f 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Oct 13 12:12:39 CEST 2008 - ma@suse.de
+
+- Fix package-manager script to properly quote arguments. (bnc #30903)
+- revision 11311
+
+-------------------------------------------------------------------
 Mon Oct 13 11:03:04 CEST 2008 - schubi@suse.de
 
 - regarding orphaned resolvables

diff --git a/tools/package-manager/package-manager b/tools/package-manager/package-manager
index 2afda5f..af879b3 100755 (executable)
--- a/tools/package-manager/package-manager
+++ b/tools/package-manager/package-manager
@@ -12,6 +12,15 @@ EOF
     exit $1
 }
 
+# quoted concatenation of arguments
+function mkCmd() {
+  printf "%q" "$1"
+  shift
+  for ARG in "$@"; do
+    printf " %q" "$ARG"
+  done
+}
+
 HAVE_ZLM=false
 if rpm -q zen-updater >/dev/null; then
     HAVE_ZLM=true
@@ -22,7 +31,7 @@ if rpm -q yast2-packager >/dev/null; then
 fi
 
 if $HAVE_ZLM; then
-    if $HAVE_OPENSUSE; then    
+    if $HAVE_OPENSUSE; then
        if [ -f /etc/sysconfig/sw_management ]; then
            . /etc/sysconfig/sw_management
            PSMS="$PREFERRED_SW_MANAGER_STACK"
@@ -51,7 +60,7 @@ fi
 
 xsu() {
     # a copy of xdg-su.
-    package-manager-su -c "$*"
+    package-manager-su -c "$(mkCmd "$@")"
 }
 
 # do_* fall back to yast for STACK=ugh