Fix for bug #121106, resume + skipfirst + pretend would print the skipped package.
authorAlec Warner <antarus@gentoo.org>
Tue, 31 Jan 2006 23:28:57 +0000 (23:28 -0000)
committerAlec Warner <antarus@gentoo.org>
Tue, 31 Jan 2006 23:28:57 +0000 (23:28 -0000)
Thanks to Andrew D. Keyser (aka Legoguy) <andrewdk@sbcglobal.net> for reporting.

svn path=/main/trunk/; revision=2611

bin/emerge

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