diff options
Diffstat (limited to 'pym/portage/package/ebuild/fetch.py')
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 06cb90801..d5ad7f827 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -779,6 +779,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", # allow different fetchcommands per protocol protocol = loc[0:loc.find("://")] + global_config_path = GLOBAL_CONFIG_PATH + if mysettings['EPREFIX']: + global_config_path = os.path.join(mysettings['EPREFIX'], + GLOBAL_CONFIG_PATH.lstrip(os.sep)) + missing_file_param = False fetchcommand_var = "FETCHCOMMAND_" + protocol.upper() fetchcommand = mysettings.get(fetchcommand_var) @@ -789,7 +794,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", writemsg_level( _("!!! %s is unset. It should " "have been defined in\n!!! %s/make.globals.\n") \ - % (fetchcommand_var, GLOBAL_CONFIG_PATH), + % (fetchcommand_var, global_config_path), level=logging.ERROR, noiselevel=-1) return 0 if "${FILE}" not in fetchcommand: @@ -808,7 +813,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", writemsg_level( _("!!! %s is unset. It should " "have been defined in\n!!! %s/make.globals.\n") \ - % (resumecommand_var, GLOBAL_CONFIG_PATH), + % (resumecommand_var, global_config_path), level=logging.ERROR, noiselevel=-1) return 0 if "${FILE}" not in resumecommand: |