diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-21 02:04:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-21 02:04:27 +0000 |
| commit | 1b09a3ac99dc2ee5e31c2f0da65b0ea9ccfdee8a (patch) | |
| tree | acfe14f7b6bb3953eda69935933a913d6effe9ac | |
| parent | 1298f0fa909c44d93edb26ec706e4a11ca44383e (diff) | |
| download | portage-1b09a3ac99dc2ee5e31c2f0da65b0ea9ccfdee8a.tar.gz portage-1b09a3ac99dc2ee5e31c2f0da65b0ea9ccfdee8a.tar.bz2 portage-1b09a3ac99dc2ee5e31c2f0da65b0ea9ccfdee8a.zip | |
Tweak profile validation and warning logic a bit.
svn path=/main/trunk/; revision=9015
| -rw-r--r-- | pym/_emerge/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 48d2c0326..869894d78 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6741,7 +6741,9 @@ def parse_opts(tmpcmdline, silent=False): return myaction, myopts, myfiles def validate_ebuild_environment(trees): - pass + for myroot in trees: + settings = trees[myroot]["vartree"].settings + settings.validate() def load_emerge_config(trees=None): kwargs = {} diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index c84ea2a28..a6077c1e4 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1674,9 +1674,9 @@ class config(object): 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"]) @@ -6166,7 +6166,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"] != "/": @@ -6192,7 +6191,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: |