X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvemerge;h=69a314cafecc821f1e5465986d07c3f3b7f3d91f;hb=b7785f953cf988346d0f36c5852af39db3d1b00c;hp=639fdd1cd030e3e9b8460ec6c93840c045efb60e;hpb=19ef6bad17e92a9cedb7db8eddee2bebf1aa7c4d;p=util-vserver.git

diff --git a/scripts/vemerge b/scripts/vemerge
index 639fdd1..69a314c 100755
--- a/scripts/vemerge
+++ b/scripts/vemerge
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: vemerge 2363 2006-11-03 14:36:23Z hollow $
+# $Id: vemerge 2635 2007-11-17 23:52:59Z hollow $
 
 # Copyright (C) 2006 Benedikt Boehm <hollow@gentoo.org>
 #  
@@ -58,16 +58,24 @@ while true; do
 	(--debug)	send_through=( "${send_through[@]}" "$1" ); set -x;;
 	(--quiet|-q)	send_through=( "${send_through[@]}" "$1" );;
 	(--all)         vsomething_opts=( "${vsomething_opts[@]}" "$1" );;
-	(--)		shift; break;;
+	(--)		test ${#vsomething_opts[@]} -eq 0 && shift; break;;
 	(*)	   	echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;;
     esac
     shift
 done
 
+declare -a vserver_names
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+	(--)		shift; break;;
+	(*)	   	vserver_names=( "${vserver_names[@]}" "$1" );;
+    esac
+    shift
+done
+
 VSOMETHING_TITLE=vemerge
 VSOMETHING_PKGMGMT=1
 
 export VSOMETHING_TITLE VSOMETHING_PKGMGMT
-
-test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
-exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@"
+exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- "$@"