Fix bug with --package-names option not rebuilding packages (Bug #169761)

svn path=/; revision=356

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index d774919511adcd9666a63c239bd3ded883c3c18c..fa2f29383d9c69c356e17ca1cc54db5ce0ad486f 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-13 Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Fix bug with --package-names option not rebuilding
+       packages (Bug #169761)
+
 2007-03-10 Paul Varner <fuzzyray@gentoo.org>
        * equery: Add --depth option to equery depgraph to limit the depth of
        the dependency graph. (Bug #115807)

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index f4040512cc50be2399b10709955f811ebf98dc08..c58ac046e8221b36be7fda985567a2cd0be466f2 100755 (executable)
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -634,7 +634,7 @@ else
                        done
                        ln -f $LLIST.4_ebuilds $LLIST.5_order
                else
-                       (EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --deep --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5b_status ) | sed -n 's/ //g;s/^.*\]//p' | grep "$REBUILD_GREP" >$LLIST.5_order
+                       (EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --deep --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5b_status ) | sed -n 's/  *$//;s/^\[.*\] //p' | awk '{print $1}' | grep "$REBUILD_GREP" >$LLIST.5_order
                        if [ $(cat $LLIST.5b_status) -gt 0 ] ; then
                                echo ""
                                echo -e "${RD}Warning: Failed to resolve package order."