diff options
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 17f83672c..48b0955d0 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1172,13 +1172,11 @@ def expand_set_arguments(myfiles, myaction, root_config): def repo_name_check(trees): missing_repo_names = set() - for root, root_trees in trees.items(): - if "porttree" in root_trees: - portdb = root_trees["porttree"].dbapi - missing_repo_names.update(portdb.porttrees) - repos = portdb.getRepositories() - for r in repos: - missing_repo_names.discard(portdb.getRepositoryPath(r)) + for root_trees in trees.values(): + porttree = root_trees.get("porttree") + if porttree: + portdb = porttree.dbapi + missing_repo_names.update(portdb.getMissingRepoNames()) if portdb.porttree_root in missing_repo_names and \ not os.path.exists(os.path.join( portdb.porttree_root, "profiles")): @@ -1197,6 +1195,7 @@ def repo_name_check(trees): msg.extend(textwrap.wrap("NOTE: Each repo_name entry " + \ "should be a plain text file containing a unique " + \ "name for the repository on the first line.", 70)) + msg.append("\n") writemsg_level("".join("%s\n" % l for l in msg), level=logging.WARNING, noiselevel=-1) @@ -1219,7 +1218,7 @@ def repo_name_duplicate_check(trees): msg.append(' profiles/repo_name entries:') msg.append('') for k in sorted(ignored_repos): - msg.append(' %s overrides' % (k,)) + msg.append(' %s overrides' % ", ".join(k)) for path in ignored_repos[k]: msg.append(' %s' % (path,)) msg.append('') @@ -1228,6 +1227,7 @@ def repo_name_duplicate_check(trees): "to avoid having duplicates ignored. " + \ "Set PORTAGE_REPO_DUPLICATE_WARN=\"0\" in " + \ "/etc/make.conf if you would like to disable this warning.")) + msg.append("\n") writemsg_level(''.join('%s\n' % l for l in msg), level=logging.WARNING, noiselevel=-1) |