diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
| commit | 59d49a224ea5d008ce9eb2cdd312e3f46870fa4b (patch) | |
| tree | 5c67e5b4de50ca2d11c6fefca2e3fc614b2a6c2a /pym/_emerge/actions.py | |
| parent | 72c0773f386df7e99e94bac877cb1c60db58833b (diff) | |
| download | portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.gz portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.bz2 portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.zip | |
Update docs, comments, and messages to refer to make.globals in
/usr/share/portage/config/ instead of /etc/make.globals.
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index fb692c363..033a7d0bb 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -27,7 +27,7 @@ from portage import os from portage import digraph from portage import _unicode_decode, _unicode_encode from portage.cache.cache_errors import CacheError -from portage.const import NEWS_LIB_PATH +from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH from portage.dbapi.dep_expand import dep_expand from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ red, yellow @@ -1814,7 +1814,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): myportdir = portdb.porttree_root out = portage.output.EOutput() if not myportdir: - sys.stderr.write("!!! PORTDIR is undefined. Is /etc/make.globals missing?\n") + sys.stderr.write("!!! PORTDIR is undefined. " + \ + "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH) sys.exit(1) if myportdir[-1]=="/": myportdir=myportdir[:-1] @@ -1853,7 +1854,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): syncuri = settings.get("SYNC", "").strip() if not syncuri: - writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n", + writemsg_level("!!! SYNC is undefined. " + \ + "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH, noiselevel=-1, level=logging.ERROR) return 1 |