diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-20 04:40:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-20 04:40:32 +0000 |
| commit | ca754f2601b343c71ed4fbad1dff7916b3ea1714 (patch) | |
| tree | 2e585cab0b30ef3a22af9e82adc592b77cf662a8 | |
| parent | f35d7c9dae03f99f8d3bcea6166dc18365f52c21 (diff) | |
| download | portage-ca754f2601b343c71ed4fbad1dff7916b3ea1714.tar.gz portage-ca754f2601b343c71ed4fbad1dff7916b3ea1714.tar.bz2 portage-ca754f2601b343c71ed4fbad1dff7916b3ea1714.zip | |
Remove redundant processing of PORTDIR_OVERLAY for cloned config instances.
svn path=/main/trunk/; revision=3958
| -rw-r--r-- | pym/portage.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pym/portage.py b/pym/portage.py index 9977cdfc6..43854226e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1200,6 +1200,19 @@ class config: while "PORTAGE_DEPCACHEDIR" in self: del self["PORTAGE_DEPCACHEDIR"] + overlays = self.get("PORTDIR_OVERLAY","").split() + if overlays: + new_ov = [] + for ov in overlays: + ov = normalize_path(ov) + if os.path.isdir(ov): + new_ov.append(ov) + else: + writemsg("!!! Invalid PORTDIR_OVERLAY" + \ + " (not a dir): '%s'\n" % ov, noiselevel=-1) + self["PORTDIR_OVERLAY"] = " ".join(new_ov) + self.backup_changes("PORTDIR_OVERLAY") + self.lookuplist=self.configlist[:] self.lookuplist.reverse() @@ -1211,19 +1224,6 @@ class config: #prepend db to list to get correct order self.uvlist[0:0]=[self.configdict[x]] - overlays = string.split(self["PORTDIR_OVERLAY"]) - if overlays: - new_ov=[] - for ov in overlays: - ov = normalize_path(ov) - if os.path.isdir(ov): - new_ov.append(ov) - else: - writemsg(red("!!! Invalid PORTDIR_OVERLAY (not a dir): "+ov+"\n"), - noiselevel=-1) - self["PORTDIR_OVERLAY"] = string.join(new_ov) - self.backup_changes("PORTDIR_OVERLAY") - if clone is None: self.regenerate() self.features = portage_util.unique_array(self["FEATURES"].split()) |