diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-04-25 05:11:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-25 05:11:07 +0000 |
| commit | 61aad2d6444c0ef0fe1adcb9e8c8bf0868652ae5 (patch) | |
| tree | 15c48d2cb517bf129acda82bb93e1e1cb0bc2694 | |
| parent | Split a config.validate() method and move PORTAGE_TMPDIR sanity check to doeb... (diff) | |
| download | portage-61aad2d6444c0ef0fe1adcb9e8c8bf0868652ae5.tar.gz portage-61aad2d6444c0ef0fe1adcb9e8c8bf0868652ae5.tar.bz2 portage-61aad2d6444c0ef0fe1adcb9e8c8bf0868652ae5.zip | |
Move USER_VIRTUALS_FILE deprecation warning to config.validate().
svn path=/main/trunk/; revision=3225
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage.py b/pym/portage.py index e69310d9f..63192a83e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1285,6 +1285,11 @@ class config: writemsg("!!! It should point into a profile within %s/profiles/\n" % self["PORTDIR"]) writemsg("!!! (You can safely ignore this message when syncing. It's harmless.)\n\n\n") + if os.path.exists(USER_VIRTUALS_FILE): + writemsg("\n!!! /etc/portage/virtuals is deprecated in favor of\n") + writemsg("!!! /etc/portage/profile/virtuals. Please move it to\n") + writemsg("!!! this new location.\n\n") + def loadVirtuals(self,root): """Not currently used by portage.""" writemsg("DEPRECATED: portage.config.loadVirtuals\n") @@ -6774,11 +6779,6 @@ profiledir=None if os.path.isdir(PROFILE_PATH): profiledir = PROFILE_PATH -if os.path.exists(USER_VIRTUALS_FILE): - writemsg(red("\n!!! /etc/portage/virtuals is deprecated in favor of\n")) - writemsg(red("!!! /etc/portage/profile/virtuals. Please move it to\n")) - writemsg(red("!!! this new location.\n\n")) - db={} # We're going to lock the global config to prevent changes, but we need |