summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-01-31 23:28:57 +0000
committerAlec Warner <antarus@gentoo.org>2006-01-31 23:28:57 +0000
commitdc980664930c6081d3206a7e4f6490c429dedff3 (patch)
treec05825e5429148390dc670ca98243ce729e587b6
parent9c3f3131a812373cc7980e5048ab5db1f13a62f6 (diff)
downloadportage-dc980664930c6081d3206a7e4f6490c429dedff3.tar.gz
portage-dc980664930c6081d3206a7e4f6490c429dedff3.tar.bz2
portage-dc980664930c6081d3206a7e4f6490c429dedff3.zip
Fix for bug #121106, resume + skipfirst + pretend would print the skipped package.
Thanks to Andrew D. Keyser (aka Legoguy) <andrewdk@sbcglobal.net> for reporting. svn path=/main/trunk/; revision=2611
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 40691a3b3..a01188372 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -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: