From 0006d25964bdc5ac467c765e4ecef9b3985ea893 Mon Sep 17 00:00:00 2001 From: idl0r Date: Thu, 1 Apr 2010 15:03:35 +0000 Subject: [PATCH] revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS to allow overwriting, bug 307023, thanks to Albert W. Hopkins . svn path=/trunk/gentoolkit/; revision=765 --- ChangeLog | 4 ++++ bin/revdep-rebuild | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 275b93f..25573c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-04-01: Christian Ruppert + * revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS, + bug 307023, thanks to Albert W. Hopkins . + 2010-03-31: Christian Ruppert * 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 -- 2.26.2