From: idl0r <idl0r@gentoo.org>
Date: Thu, 1 Apr 2010 15:03:35 +0000 (-0000)
Subject: revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS to allow overwriting,
X-Git-Tag: gentoolkit-0.3.0_rc10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0006d25964bdc5ac467c765e4ecef9b3985ea893;p=gentoolkit.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 275b93f..25573c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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