diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2006-12-13 16:12:25 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2006-12-13 16:12:25 +0000 |
| commit | eed3c20f56bf45003fedf42d4294107aaa92a38d (patch) | |
| tree | bd43afaa1e6d67633e1270423cf56e58e1aaff89 | |
| parent | 4de8b35818cc20a672372a098ae62517bfd4b014 (diff) | |
| download | gentoolkit-eed3c20f56bf45003fedf42d4294107aaa92a38d.tar.gz | |
Fix handling of /etc/portage/package.mask
svn path=/; revision=328
| -rw-r--r-- | trunk/ChangeLog | 4 | ||||
| -rwxr-xr-x | trunk/src/revdep-rebuild/revdep-rebuild | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index c4cb031..26e1138 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,7 @@ +2006-12-13 Paul Varner <fuzzyray@gentoo.org> + * revdep-rebuild: Fix handling of /etc/portage/package.mask (Bug + #158025) Thanks to Wolfram Schlich for the patch. + 2006-12-12 Paul Varner <fuzzyray@gentoo.org> * equery: Add --tree option to equery files command. (Bug #62898) Thanks to scope for the patch. diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild index d633c3f..54acf98 100755 --- a/trunk/src/revdep-rebuild/revdep-rebuild +++ b/trunk/src/revdep-rebuild/revdep-rebuild @@ -557,7 +557,7 @@ if $PACKAGE_NAMES ; then continue fi # Otherwise mask the other SLOTTED versions and check for latest - if [ -f /etc/portage/package.mask ] + if [ -e /etc/portage/package.mask ] then mv -f /etc/portage/package.mask /etc/portage/package.mask.revdep-rebuild.backup else @@ -571,11 +571,10 @@ if $PACKAGE_NAMES ; then done best_visible=$(portageq best_visible $PORTAGE_ROOT $PKG) [ "x" != "x$best_visible" ] && echo $best_visible - if [ -f /etc/portage/package.mask.revdep-rebuild.backup ] + rm -f /etc/portage/package.mask + if [ -e /etc/portage/package.mask.revdep-rebuild.backup ] then mv -f /etc/portage/package.mask.revdep-rebuild.backup /etc/portage/package.mask - else - rm -f /etc/portage/package.mask fi done > $LLIST.4_ebuilds echo -e " done.\n ($LLIST.4_ebuilds)" |