diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2013-01-17 16:36:07 -0600 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2013-01-17 16:36:07 -0600 |
| commit | 4386dfd32cf794e2dc42b0d0e68ede9341655217 (patch) | |
| tree | 84c3bd8b0fa83425bd11a1504d819d05d8511fa7 /bin | |
| parent | Add REVDEP_DEFAULT_OPTS variable to allow overriding of EMERGE_DEFAULT_OPTS f... (diff) | |
| download | gentoolkit-4386dfd32cf794e2dc42b0d0e68ede9341655217.tar.gz gentoolkit-4386dfd32cf794e2dc42b0d0e68ede9341655217.tar.bz2 gentoolkit-4386dfd32cf794e2dc42b0d0e68ede9341655217.zip | |
Change behavior and name of REVDEP_DEFAULT_OPTS variable.
* Changed name to REVDEP_REBUILD_DEFAULTS_OPTS
* Change behavior to have it replace the value of
EMERGE_DEFAULT_OPTS.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/revdep-rebuild.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh index 6b32ae4..a14700e 100755 --- a/bin/revdep-rebuild.sh +++ b/bin/revdep-rebuild.sh @@ -61,7 +61,7 @@ declare EMERGE_DEFAULT_OPTS # String of options portage assumes to be set declare EMERGE_OPTIONS # Array of options to pass to portage declare PORTAGE_NICENESS # Renice to this value declare PORTAGE_ROOT # The root path for portage -declare REVDEP_DEFAULT_OPTS # String of default emerge options for revdep-rebuild +declare REVDEP_REBUILD_DEFAULT_OPTS # String of default emerge options for revdep-rebuild # Customizable incremental variables: # These variables can be prepended to either by setting the variable in @@ -443,11 +443,6 @@ get_opts() { SEARCH_BROKEN=1 FULL_LD_PATH=1 - # Add the revdep-rebuild default options - if [[ -n ${REVDEP_DEFAULT_OPTS} ]]; then - EMERGE_OPTIONS+=("$REVDEP_DEFAULT_OPTS") - fi - while [[ $1 ]]; do case $1 in --) shift @@ -1039,19 +1034,25 @@ portage_settings() { local ORIG_SEARCH_DIRS="$SEARCH_DIRS" local ORIG_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK" local ORIG_LD_LIBRARY_MASK="$LD_LIBRARY_MASK" - local ORIG_REVDEP_DEFAULT_OPTS="$REVDEP_DEFAULT_OPTS" + local ORIG_REVDEP_REBUILD_DEFAULT_OPTS="$REVDEP_REBUILD_DEFAULT_OPTS" unset SEARCH_DIRS unset SEARCH_DIRS_MASK unset LD_LIBRARY_MASK - unset REVDEP_DEFAULT_OPTS + unset REVDEP_REBUILD_DEFAULT_OPTS - eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_DEFAULT_OPTS) + 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 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" - REVDEP_DEFAULT_OPTS="$ORIG_REVDEP_DEFAULT_OPTS $REVDEP_DEFAULT_OPTS" + REVDEP_REBUILD_DEFAULT_OPTS="$ORIG_REVDEP_REBUILD_DEFAULT_OPTS $REVDEP_REBUILD_DEFAULT_OPTS" + + # Replace EMERGE_DEFAULT_OPTS with REVDEP_REBUILD_DEFAULT_OPTS (if it exists) + if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then + EMERGE_DEFAULT_OPTS=("$REVDEP_REBUILD_DEFAULT_OPTS") + fi + } ## |