Revert change in -r2611, re-opening bug 121106. The fix is not that simple...as...
authorAlec Warner <antarus@gentoo.org>
Thu, 2 Feb 2006 16:04:27 +0000 (16:04 -0000)
committerAlec Warner <antarus@gentoo.org>
Thu, 2 Feb 2006 16:04:27 +0000 (16:04 -0000)
svn path=/main/trunk/; revision=2625

bin/emerge

index a01188372c7711c2c757ec5e6715b86fef347c79..40691a3b3d85cbb8d260afe4157c6f372c8d8a70 100755 (executable)
@@ -3319,8 +3319,7 @@ else:
 
        if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts):
                if ("--resume" in myopts):
-                       ### Cut off the first element, since we aren't merging it #121106
-                       mydepgraph.display(portage.mtimedb["resume"]["mergelist"][1:])
+                       mydepgraph.display(portage.mtimedb["resume"]["mergelist"])
                else:
                        mydepgraph.display(mydepgraph.altlist())
        else: