| 1 |
commit: cd6a0dbd9e44eb2dd8c418d3d4733cb4e71962c2 |
| 2 |
Author: Paul Varner <fuzzyray <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 29 17:32:17 2013 +0000 |
| 4 |
Commit: Paul Varner <fuzzyray <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 29 17:32:17 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=cd6a0dbd |
| 7 |
|
| 8 |
Convert EMERGE_DEFAULT_OPTS to an array (Bug 482232). |
| 9 |
|
| 10 |
Patch from zmedico |
| 11 |
|
| 12 |
--- |
| 13 |
bin/revdep-rebuild.sh | 12 +++++++----- |
| 14 |
1 file changed, 7 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh |
| 17 |
index a14700e..7f848bc 100755 |
| 18 |
--- a/bin/revdep-rebuild.sh |
| 19 |
+++ b/bin/revdep-rebuild.sh |
| 20 |
@@ -942,7 +942,7 @@ list_skipped_packages() { |
| 21 |
ewarn |
| 22 |
} |
| 23 |
get_build_order() { |
| 24 |
- local -r OLD_EMERGE_DEFAULT_OPTS="$EMERGE_DEFAULT_OPTS" |
| 25 |
+ local -a OLD_EMERGE_DEFAULT_OPTS=("${EMERGE_DEFAULT_OPTS[@]}") |
| 26 |
local RAW_REBUILD_LIST |
| 27 |
local REBUILD_GREP |
| 28 |
local i |
| 29 |
@@ -957,7 +957,7 @@ get_build_order() { |
| 30 |
clean_trap "$ORDER_FILE" |
| 31 |
RAW_REBUILD_LIST=$(<"$EBUILDS_FILE") |
| 32 |
if [[ $RAW_REBUILD_LIST ]]; then |
| 33 |
- export EMERGE_DEFAULT_OPTS="--nospinner --pretend --oneshot --quiet" |
| 34 |
+ EMERGE_DEFAULT_OPTS=(--nospinner --pretend --oneshot --quiet) |
| 35 |
RAW_REBUILD_LIST=($RAW_REBUILD_LIST) # convert into array |
| 36 |
# If PACKAGE_NAMES is defined we're using slots, not versions |
| 37 |
if [[ $PACKAGE_NAMES ]]; then |
| 38 |
@@ -1010,7 +1010,7 @@ get_build_order() { |
| 39 |
else |
| 40 |
echo "$RAW_REBUILD_LIST" > "$ORDER_FILE" |
| 41 |
fi |
| 42 |
- export EMERGE_DEFAULT_OPTS="$OLD_EMERGE_DEFAULT_OPTS" |
| 43 |
+ EMERGE_DEFAULT_OPTS=("${OLD_EMERGE_DEFAULT_OPTS[@]}") |
| 44 |
else |
| 45 |
einfo 'Nothing to rebuild.' |
| 46 |
die 1 '(The program should have already quit, so this is a minor bug.)' |
| 47 |
@@ -1043,6 +1043,8 @@ portage_settings() { |
| 48 |
eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS) |
| 49 |
export NOCOLOR |
| 50 |
|
| 51 |
+ # Convert quoted paths to array. |
| 52 |
+ eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})" |
| 53 |
SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS" |
| 54 |
SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK" |
| 55 |
LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK" |
| 56 |
@@ -1142,7 +1144,7 @@ rebuild() { |
| 57 |
trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM |
| 58 |
|
| 59 |
[[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild' |
| 60 |
- echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST" |
| 61 |
+ echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST" |
| 62 |
|
| 63 |
is_real_merge && countdown 10 |
| 64 |
|
| 65 |
@@ -1151,7 +1153,7 @@ rebuild() { |
| 66 |
|
| 67 |
# Run in background to correctly handle Ctrl-C |
| 68 |
{ |
| 69 |
- emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6 |
| 70 |
+ emerge --complete-graph=y --oneshot "${EMERGE_DEFAULT_OPTS[@]}" ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6 |
| 71 |
echo $? > "$STATUS_FILE" |
| 72 |
} & |
| 73 |
wait |
Archives