summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-06 23:50:55 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-06 23:50:55 -0700
commit8d3c24081c973ebb71de4645f64dc053a6be0ca3 (patch)
tree85ebc500e80bc1cfe53fb8ce4a925c056d7e5075
parent47c8155376417b105651f55f1e4d0669b3e89cf5 (diff)
downloadportage-8d3c24081c973ebb71de4645f64dc053a6be0ca3.tar.gz
portage-8d3c24081c973ebb71de4645f64dc053a6be0ca3.tar.bz2
portage-8d3c24081c973ebb71de4645f64dc053a6be0ca3.zip
Allow repo atoms for unmerge, depclean and prune.
-rw-r--r--pym/_emerge/actions.py4
-rw-r--r--pym/portage/dbapi/dep_expand.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 5fd7a9d11..b7cfd4230 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -566,7 +566,7 @@ def action_depclean(settings, trees, ldpath_mtimes,
root_config = trees[settings['ROOT']]['root_config']
vardb = root_config.trees['vartree'].dbapi
- args_set = InternalPackageSet()
+ args_set = InternalPackageSet(allow_repo=True)
if myfiles:
args_set.update(myfiles)
matched_packages = False
@@ -2427,7 +2427,7 @@ def action_uninstall(settings, trees, ldpath_mtimes,
# Ensure atoms are valid before calling unmerge().
# For backward compat, leading '=' is not required.
for x in files:
- if is_valid_package_atom(x) or \
+ if is_valid_package_atom(x, allow_repo=True) or \
(ignore_missing_eq and is_valid_package_atom('=' + x)):
try:
diff --git a/pym/portage/dbapi/dep_expand.py b/pym/portage/dbapi/dep_expand.py
index 58ffae35b..60e30df87 100644
--- a/pym/portage/dbapi/dep_expand.py
+++ b/pym/portage/dbapi/dep_expand.py
@@ -30,12 +30,12 @@ def dep_expand(mydep, mydb=None, use_cache=1, settings=None):
mydep = orig_dep[:alphanum.start()] + "null/" + \
orig_dep[alphanum.start():]
try:
- mydep = Atom(mydep)
+ mydep = Atom(mydep, allow_repo=True)
except InvalidAtom:
# Missing '=' prefix is allowed for backward compatibility.
- if not isvalidatom("=" + mydep):
+ if not isvalidatom("=" + mydep, allow_repo=True):
raise
- mydep = Atom('=' + mydep)
+ mydep = Atom('=' + mydep, allow_repo=True)
orig_dep = '=' + orig_dep
if not has_cat:
null_cat, pn = catsplit(mydep.cp)