projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
296ea02
)
Fix typo.
author
Zac Medico
<zmedico@gentoo.org>
Sun, 15 Jul 2007 03:45:36 +0000
(
03:45
-0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 15 Jul 2007 03:45:36 +0000
(
03:45
-0000)
svn path=/main/trunk/; revision=7265
pym/emerge/__init__.py
patch
|
blob
|
history
diff --git
a/pym/emerge/__init__.py
b/pym/emerge/__init__.py
index f409f1ba0718c1536c9d28ae8685acfc459a32d4..541be2c15537e59692d9f2e3b98e31c7bf8f27d4 100644
(file)
--- a/
pym/emerge/__init__.py
+++ b/
pym/emerge/__init__.py
@@
-3537,8
+3537,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[:]