diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-21 02:51:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-21 02:51:14 +0000 |
| commit | dccc1676525d274cd4c8b8204825e0193860a5ba (patch) | |
| tree | 7dbf78857cc85a4ba22819a7c55b5d279f533f34 /pym | |
| parent | da513e5ee6a78207b0718af4e0f3317ea4132ee2 (diff) | |
| download | portage-dccc1676525d274cd4c8b8204825e0193860a5ba.tar.gz portage-dccc1676525d274cd4c8b8204825e0193860a5ba.tar.bz2 portage-dccc1676525d274cd4c8b8204825e0193860a5ba.zip | |
Tweak profile validation and warning logic a bit. (trunk r9015)
svn path=/main/branches/2.1.2/; revision=9022
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index 0f5b2ca26..13ba9324c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1724,9 +1724,9 @@ class config: abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"], PROFILE_PATH.lstrip(os.path.sep)) - if not os.path.islink(abs_profile_path) and \ + if not self.profile_path or (not os.path.islink(abs_profile_path) and \ not os.path.exists(os.path.join(abs_profile_path, "parent")) and \ - os.path.exists(os.path.join(self["PORTDIR"], "profiles")): + os.path.exists(os.path.join(self["PORTDIR"], "profiles"))): writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % abs_profile_path, noiselevel=-1) writemsg("!!! It should point into a profile within %s/profiles/\n" % self["PORTDIR"]) @@ -9823,7 +9823,6 @@ def create_trees(config_root=None, target_root=None, trees=None): settings = config(config_root=config_root, target_root=target_root, config_incrementals=portage_const.INCREMENTALS) settings.lock() - settings.validate() myroots = [(settings["ROOT"], settings)] if settings["ROOT"] != "/": @@ -9849,7 +9848,6 @@ def create_trees(config_root=None, target_root=None, trees=None): backupenv.pop(k, None) settings.regenerate() settings.lock() - settings.validate() myroots.append((settings["ROOT"], settings)) for myroot, mysettings in myroots: |