diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2006-07-28 20:01:51 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2006-07-28 20:01:51 +0000 |
| commit | 13e098eb7013ff92c50351bc38dcfa0b6beab0a8 (patch) | |
| tree | ad9f69671a453cc39a0e96be324c57299936ac49 /trunk | |
| parent | 3b49de4f24b1dca52bd7f56beee57a45adc5511c (diff) | |
| download | gentoolkit-13e098eb7013ff92c50351bc38dcfa0b6beab0a8.tar.gz | |
Added patch to fix revdep-rebuild bug #37485
svn path=/; revision=306
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/ChangeLog | 5 | ||||
| -rwxr-xr-x | trunk/src/revdep-rebuild/revdep-rebuild | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 336b660..3cc782e 100644 --- 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 ed1e11b..94a3f45 100755 --- 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 |