Added patch to fix revdep-rebuild bug #37485

svn path=/; revision=306

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 336b660b5103b1f2a880245a598a2fba27acd2e0..3cc782eff8dcdcbbcd254a36fe6fea817cc8de4e 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28 Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Fix revdep-rebuild to correctly handle --ask being
+       passed to emerge. Thanks to Sal Gonzalez <ghostx@optonline.net> for
+       the patch. (Bug #37485)
+
 2006-07-07 Paul Varner <fuzzyray@gentoo.org>
        * revdep-rebuild: Rename --no-path to --no-ld-path and change
        functionality to not set LD_LIBRARY_PATH.  This fixes bug #96946 as

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index ed1e11b9186beea43b4e875ad1e0eb1fe7ff8509..94a3f456e5536324a61b03787c609bb47a1531b6 100755 (executable)
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -658,13 +658,19 @@ if $IS_REAL_MERGE ; then
        echo
 fi
 
+# Link file descriptor #6 with stdin
+exec 6<&0
+
 # Run in background to correctly handle Ctrl-C
 (
-       EMERGE_DEFAULT_OPTS="" emerge --oneshot $EMERGE_OPTIONS $REBUILD_LIST
+       EMERGE_DEFAULT_OPTS="" emerge --oneshot $EMERGE_OPTIONS $REBUILD_LIST <&6
        echo $? >$LLIST.6_status
 ) &
 wait
 
+# Now restore stdin from fd #6, where it had been saved, and close fd #6 ( 6<&- ) to free it for other processes to use.
+exec 0<&6 6<&-
+
 #if $EXACT_EBUILDS ; then
 #      mv -i /usr/portage/profiles/package.mask.hidden /usr/portage/profiles/package.mask
 #      trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM