aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-09-23 13:44:34 -0700
committerZac Medico <zmedico@gentoo.org>2013-09-23 13:44:34 -0700
commit923f912d7c5ade8b5b18f23f1cd12add08f73c21 (patch)
tree14e5531642b547bec66ed2fabb288856b1dd0fca /pym/portage/repository/config.py
parent_emerge: Implement verbose-conflicts, bug #481366 (diff)
downloadportage-923f912d7c5ade8b5b18f23f1cd12add08f73c21.tar.gz
portage-923f912d7c5ade8b5b18f23f1cd12add08f73c21.tar.bz2
portage-923f912d7c5ade8b5b18f23f1cd12add08f73c21.zip
emerge-webrsync: handle missing dir, bug #484950
Diffstat (limited to 'pym/portage/repository/config.py')
-rw-r--r--pym/portage/repository/config.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index bb63b1a55..b14eeb7fe 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -443,7 +443,10 @@ class RepoConfigLoader(object):
#overlay priority is negative because we want them to be looked before any other repo
base_priority = 0
for ov in overlays:
- if isdir_raise_eaccess(ov):
+ # Ignore missing directory for 'gentoo' so that
+ # first sync with emerge-webrsync is possible.
+ if isdir_raise_eaccess(ov) or \
+ (base_priority == 0 and ov is portdir):
repo_opts = default_repo_opts.copy()
repo_opts['location'] = ov
repo = RepoConfig(None, repo_opts, local_config=local_config)
@@ -643,6 +646,10 @@ class RepoConfigLoader(object):
writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf has location attribute set "
"to nonexistent directory: '%s'") %
(repo_name, repo.location), level=logging.ERROR, noiselevel=-1)
+
+ # Ignore missing directory for 'gentoo' so that
+ # first sync with emerge-webrsync is possible.
+ if repo.name != 'gentoo':
del prepos[repo_name]
continue