summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-02-02 16:04:27 +0000
committerAlec Warner <antarus@gentoo.org>2006-02-02 16:04:27 +0000
commitf383da499d0c599ecbd7c3deb5014fe7a0de6cf6 (patch)
tree059467e5e11d5d82feb317a1226fcba1496283f4
parentf20801229de80aba3686ed4b1683da5ae9bf8bf3 (diff)
downloadportage-f383da499d0c599ecbd7c3deb5014fe7a0de6cf6.tar.gz
portage-f383da499d0c599ecbd7c3deb5014fe7a0de6cf6.tar.bz2
portage-f383da499d0c599ecbd7c3deb5014fe7a0de6cf6.zip
Revert change in -r2611, re-opening bug 121106. The fix is not that simple...as usual :)
svn path=/main/trunk/; revision=2625
-rwxr-xr-xbin/emerge3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index a01188372..40691a3b3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -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: