diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2013-08-29 12:32:17 -0500 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2013-08-29 12:32:17 -0500 |
| commit | cd6a0dbd9e44eb2dd8c418d3d4733cb4e71962c2 (patch) | |
| tree | 049b2c5784b5690dd95a6ea31597aa77336f716f /bin | |
| parent | Add license field to equery meta as requested by hasufell (diff) | |
| download | gentoolkit-cd6a0dbd9e44eb2dd8c418d3d4733cb4e71962c2.tar.gz gentoolkit-cd6a0dbd9e44eb2dd8c418d3d4733cb4e71962c2.tar.bz2 gentoolkit-cd6a0dbd9e44eb2dd8c418d3d4733cb4e71962c2.zip | |
Convert EMERGE_DEFAULT_OPTS to an array (Bug 482232).
Patch from zmedico
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/revdep-rebuild.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh index a14700e..7f848bc 100755 --- a/bin/revdep-rebuild.sh +++ b/bin/revdep-rebuild.sh @@ -942,7 +942,7 @@ list_skipped_packages() { ewarn } get_build_order() { - local -r OLD_EMERGE_DEFAULT_OPTS="$EMERGE_DEFAULT_OPTS" + local -a OLD_EMERGE_DEFAULT_OPTS=("${EMERGE_DEFAULT_OPTS[@]}") local RAW_REBUILD_LIST local REBUILD_GREP local i @@ -957,7 +957,7 @@ get_build_order() { clean_trap "$ORDER_FILE" RAW_REBUILD_LIST=$(<"$EBUILDS_FILE") if [[ $RAW_REBUILD_LIST ]]; then - export EMERGE_DEFAULT_OPTS="--nospinner --pretend --oneshot --quiet" + EMERGE_DEFAULT_OPTS=(--nospinner --pretend --oneshot --quiet) RAW_REBUILD_LIST=($RAW_REBUILD_LIST) # convert into array # If PACKAGE_NAMES is defined we're using slots, not versions if [[ $PACKAGE_NAMES ]]; then @@ -1010,7 +1010,7 @@ get_build_order() { else echo "$RAW_REBUILD_LIST" > "$ORDER_FILE" fi - export EMERGE_DEFAULT_OPTS="$OLD_EMERGE_DEFAULT_OPTS" + EMERGE_DEFAULT_OPTS=("${OLD_EMERGE_DEFAULT_OPTS[@]}") else einfo 'Nothing to rebuild.' die 1 '(The program should have already quit, so this is a minor bug.)' @@ -1043,6 +1043,8 @@ portage_settings() { eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS) export NOCOLOR + # Convert quoted paths to array. + eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})" SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS" SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK" LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK" @@ -1142,7 +1144,7 @@ rebuild() { trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM [[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild' - echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST" + echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST" is_real_merge && countdown 10 @@ -1151,7 +1153,7 @@ rebuild() { # Run in background to correctly handle Ctrl-C { - emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6 + emerge --complete-graph=y --oneshot "${EMERGE_DEFAULT_OPTS[@]}" ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6 echo $? > "$STATUS_FILE" } & wait |