Changeset 2635

Show
Ignore:
Timestamp:
11/18/07 00:52:59 (1 year ago)
Author:
hollow
Message:

fix a corner case in gentoo helpers

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/scripts/vdispatch-conf

    r2486 r2635  
    5959        (--quiet|-q)    send_through=( "${send_through[@]}" "$1" );; 
    6060        (--all)         vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 
    61         (--)            shift; break;; 
     61        (--)            test ${#vsomething_opts[@]} -eq 0 && shift; break;; 
    6262        (*)             echo $"vdispatch-conf: internal error; arg=='$1'" >&2; exit 1;; 
    6363    esac 
     
    6565done 
    6666 
    67 VSOMETHING_TITLE=vemerge 
     67declare -a vserver_names 
     68 
     69while [ $# -gt 0 ]; do 
     70    case "$1" in 
     71        (--)            shift; break;; 
     72        (*)             vserver_names=( "${vserver_names[@]}" "$1" );; 
     73    esac 
     74    shift 
     75done 
     76 
     77VSOMETHING_TITLE=vdispatch-conf 
    6878VSOMETHING_PKGMGMT=1 
    6979 
    7080export VSOMETHING_TITLE VSOMETHING_PKGMGMT 
    71  
    72 exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@" 
     81exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "${vserver_names[@]}" -- "$@" 
  • trunk/scripts/vemerge

    r2363 r2635  
    5959        (--quiet|-q)    send_through=( "${send_through[@]}" "$1" );; 
    6060        (--all)         vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 
     61        (--)            test ${#vsomething_opts[@]} -eq 0 && shift; break;; 
     62        (*)             echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; 
     63    esac 
     64    shift 
     65done 
     66 
     67declare -a vserver_names 
     68 
     69while [ $# -gt 0 ]; do 
     70    case "$1" in 
    6171        (--)            shift; break;; 
    62         (*)             echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; 
     72        (*)             vserver_names=( "${vserver_names[@]}" "$1" );; 
    6373    esac 
    6474    shift 
     
    6979 
    7080export VSOMETHING_TITLE VSOMETHING_PKGMGMT 
    71  
    72 test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) 
    73 exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" 
     81exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- "$@" 
  • trunk/scripts/vesync

    r2486 r2635  
    6565        (--overlay-host) overlay_host="${2%/}";; 
    6666        (--overlay-only) overlay_only=1;; 
    67         (--)             shift; break;; 
     67        (--)             test ${#vsomething_opts[@]} -eq 0 && shift; break;; 
    6868        (*)              echo $"vesync: internal error; arg=='$1'" >&2; exit 1;; 
     69    esac 
     70    shift 
     71done 
     72 
     73declare -a vserver_names 
     74 
     75while [ $# -gt 0 ]; do 
     76    case "$1" in 
     77        (--)            shift; break;; 
     78        (*)             vserver_names=( "${vserver_names[@]}" "$1" );; 
    6979    esac 
    7080    shift 
     
    7989 
    8090test $overlay_only -eq 0 && \ 
    81         $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata 
     91        $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- --metadata 
    8292 
    8393ret=$? 
    8494 
    8595test -n "$overlay" -a -n "$overlay_host" && \ 
    86         $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \ 
     96        $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "${vserver_names[@]}" -- \ 
    8797        -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/" 
    8898 
  • trunk/scripts/vupdateworld

    r2486 r2635  
    5959        (--quiet|-q)    send_through=( "${send_through[@]}" "$1" );; 
    6060        (--all)         vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 
    61         (--)            shift; break;; 
    62         (*)             echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; 
     61        (--)            test ${#vsomething_opts[@]} -eq 0 && shift; break;; 
     62        (*)             echo $"vupdateworld: internal error; arg=='$1'" >&2; exit 1;; 
    6363    esac 
    6464    shift 
     
    7575done 
    7676 
    77 VSOMETHING_TITLE=vemerge 
     77VSOMETHING_TITLE=vupdateworld 
    7878VSOMETHING_PKGMGMT=1 
    7979 
    8080export VSOMETHING_TITLE VSOMETHING_PKGMGMT 
    81  
    82 test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) 
    8381exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"