diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-09-22 22:32:03 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-26 23:50:15 -0700 |
| commit | c5a84ae41b07f76679be6393603d64d4d3aabd4d (patch) | |
| tree | 7ace92f66a30c66ab6aa0c70df89a6582e99c2b6 | |
| parent | 5309ef42b2e82160705bd0ffead1aed40d61944c (diff) | |
| download | portage-c5a84ae41b07f76679be6393603d64d4d3aabd4d.tar.gz portage-c5a84ae41b07f76679be6393603d64d4d3aabd4d.tar.bz2 portage-c5a84ae41b07f76679be6393603d64d4d3aabd4d.zip | |
reposyntax: Remove unneeded special case
| -rw-r--r-- | pym/portage/repository.py | 6 | ||||
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pym/portage/repository.py b/pym/portage/repository.py index 09e632c5d..7f0d392a5 100644 --- a/pym/portage/repository.py +++ b/pym/portage/repository.py @@ -176,11 +176,7 @@ class RepoConfigLoader(object): portdir = settings.get('PORTDIR', '') portdir_overlay = settings.get('PORTDIR_OVERLAY', '') add_overlays(portdir, portdir_overlay, prepos, ignored_map, ignored_location_map) - if paths: - parse(paths, prepos, ignored_map, ignored_location_map) - else: - prepos['DEFAULT'] = RepoConfig("DEFAULT", {"main_repo": "gentoo"}) - + parse(paths, prepos, ignored_map, ignored_location_map) ignored_repos = tuple((repo_name, tuple(paths)) \ for repo_name, paths in ignored_map.items()) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 8d6441c8c..e9eefb5cc 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -296,7 +296,7 @@ class ResolverPlayground(object): repos_conf_file = os.path.join(user_config_dir, "repos.conf") f = open(repos_conf_file, "w") - priority = 1 + priority = 999 for repo in sorted(self.repo_dirs.keys()): f.write("[%s]\n" % repo) f.write("LOCATION=%s\n" % self.repo_dirs[repo]) @@ -304,7 +304,7 @@ class ResolverPlayground(object): f.write("PRIORITY=%s\n" % 1000) else: f.write("PRIORITY=%s\n" % priority) - priority += 1 + priority -= 1 f.close() for config_file, lines in user_config.items(): |