projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
760c1ef
)
Fix typo. (trunk r7265)
author
Zac Medico
<zmedico@gentoo.org>
Sun, 15 Jul 2007 03:46:00 +0000
(
03:46
-0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 15 Jul 2007 03:46:00 +0000
(
03:46
-0000)
svn path=/main/branches/2.1.2/; revision=7266
bin/emerge
patch
|
blob
|
history
diff --git
a/bin/emerge
b/bin/emerge
index 7bdceda96ad372330ed20a37c5cfab8128cb8012..7d2f3f0a4c32851e1d588086f53e24dfdd4ae44a 100755
(executable)
--- a/
bin/emerge
+++ b/
bin/emerge
@@
-3506,8
+3506,8
@@
class MergeTask(object):
root_config = RootConfig(self.trees[self.target_root])
system_set = root_config.sets["system"]
- args_set =
root_config.sets["world"]
- world_set =
WorldSet(self.settings)
+ args_set =
AtomSet(favorites)
+ world_set =
root_config.sets["world"]
if "--resume" not in self.myopts:
mymergelist = mylist
mtimedb["resume"]["mergelist"]=mymergelist[:]