diff options
| author | idl0r <idl0r@gentoo.org> | 2010-04-01 15:03:35 +0000 |
|---|---|---|
| committer | idl0r <idl0r@gentoo.org> | 2010-04-01 15:03:35 +0000 |
| commit | 0006d25964bdc5ac467c765e4ecef9b3985ea893 (patch) | |
| tree | e13bf0f39bf91f48fcc04cd74a837a922df9bdb2 | |
| parent | 2c6f676b2696c1ac58580382a8922e1c704c92b9 (diff) | |
| download | gentoolkit-0006d25964bdc5ac467c765e4ecef9b3985ea893.tar.gz | |
revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS to allow overwriting,
bug 307023, thanks to Albert W. Hopkins <marduk@python.net>.
svn path=/trunk/gentoolkit/; revision=765
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | bin/revdep-rebuild | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2010-04-01: Christian Ruppert <idl0r@gentoo.org> + * revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS, + bug 307023, thanks to Albert W. Hopkins <marduk@python.net>. + 2010-03-31: Christian Ruppert <idl0r@gentoo.org> * epkginfo: Fix epkginfo to handle ambiguous package names. * revdep-rebuild: Check if $ERRORS_FILE exist before running gawk on it. diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild index a4fa0f7..b62dc61 100755 --- a/bin/revdep-rebuild +++ b/bin/revdep-rebuild @@ -1113,7 +1113,7 @@ rebuild() { trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM einfo 'All prepared. Starting rebuild' - echo "emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST" + echo "emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST" is_real_merge && countdown 10 @@ -1122,7 +1122,7 @@ rebuild() { # Run in background to correctly handle Ctrl-C { - emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST <&6 + emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6 echo $? > "$STATUS_FILE" } & wait |