diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2007-02-09 15:41:33 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2007-02-09 15:41:33 +0000 |
| commit | 0e600b452fd401c8aeaac962b61fbeaa6f143449 (patch) | |
| tree | 6d75a4cfab4eb58a2e16dafabac6ec803007d09c /sys-cluster | |
| parent | Remove now deprecated USE thunar-vfs entry from xfdesktop line. (diff) | |
| download | gentoo-2-0e600b452fd401c8aeaac962b61fbeaa6f143449.tar.gz gentoo-2-0e600b452fd401c8aeaac962b61fbeaa6f143449.tar.bz2 gentoo-2-0e600b452fd401c8aeaac962b61fbeaa6f143449.zip | |
finally fix vsomething patch
(Portage version: 2.1.2-r8)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/util-vserver/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch | 110 |
2 files changed, 60 insertions, 56 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog index cfa7a70e3562..e270a922926d 100644 --- a/sys-cluster/util-vserver/ChangeLog +++ b/sys-cluster/util-vserver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/util-vserver # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.74 2007/02/07 10:51:54 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.75 2007/02/09 15:41:33 hollow Exp $ + + 09 Feb 2007; Benedikt Böhm <hollow@gentoo.org> + files/util-vserver-0.30.212-vsomething-fix.patch: + finally fix vsomething patch 07 Feb 2007; Benedikt Böhm <hollow@gentoo.org> files/util-vserver-0.30.212-vsomething-fix.patch: diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch index de1841837359..ead3fff73ecf 100644 --- a/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch +++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch @@ -1,55 +1,55 @@ -Index: util-vserver-0.30.212/scripts/vupdateworld
-===================================================================
---- util-vserver-0.30.212/scripts/vupdateworld (revision 2452)
-+++ util-vserver-0.30.212/scripts/vupdateworld (revision 2486)
-@@ -65,4 +65,14 @@
- 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
-@@ -71,3 +81,3 @@
-
- test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
--exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --update --deep --newuse "$@"
-+exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"
-Index: util-vserver-0.30.212/scripts/vdispatch-conf
-===================================================================
---- util-vserver-0.30.212/scripts/vdispatch-conf (revision 2363)
-+++ util-vserver-0.30.212/scripts/vdispatch-conf (revision 2486)
-@@ -70,3 +70,3 @@
- export VSOMETHING_TITLE VSOMETHING_PKGMGMT
-
--exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}"
-+exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@"
-Index: util-vserver-0.30.212/scripts/vesync
-===================================================================
---- util-vserver-0.30.212/scripts/vesync (revision 2363)
-+++ util-vserver-0.30.212/scripts/vesync (revision 2486)
-@@ -76,15 +76,13 @@
- export VSOMETHING_TITLE VSOMETHING_PKGMGMT
-
--test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
--
- ret=0
-
- test $overlay_only -eq 0 && \
-- $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata
-+ $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata
-
- ret=$?
-
- test -n "$overlay" -a -n "$overlay_host" && \
-- $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \
-+ $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \
- -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/"
-
+Index: util-vserver-0.30.212/scripts/vupdateworld +=================================================================== +--- util-vserver-0.30.212/scripts/vupdateworld (revision 2452) ++++ util-vserver-0.30.212/scripts/vupdateworld (revision 2486) +@@ -65,4 +65,14 @@ + 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 +@@ -71,3 +81,3 @@ + + test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) +-exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --update --deep --newuse "$@" ++exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@" +Index: util-vserver-0.30.212/scripts/vdispatch-conf +=================================================================== +--- util-vserver-0.30.212/scripts/vdispatch-conf (revision 2363) ++++ util-vserver-0.30.212/scripts/vdispatch-conf (revision 2486) +@@ -70,3 +70,3 @@ + export VSOMETHING_TITLE VSOMETHING_PKGMGMT + +-exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" ++exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@" +Index: util-vserver-0.30.212/scripts/vesync +=================================================================== +--- util-vserver-0.30.212/scripts/vesync (revision 2363) ++++ util-vserver-0.30.212/scripts/vesync (revision 2486) +@@ -76,15 +76,13 @@ + export VSOMETHING_TITLE VSOMETHING_PKGMGMT + +-test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) +- + ret=0 + + test $overlay_only -eq 0 && \ +- $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata ++ $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata + + ret=$? + + test -n "$overlay" -a -n "$overlay_host" && \ +- $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \ ++ $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \ + -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/" + |