Allow repo atoms for unmerge, depclean and prune.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 5fd7a9d114adbb5870eea758570faff9a1eab1df..b7cfd4230f75abd29284b0300ae054e46c322aa4 100644 (file)
--- 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 58ffae35b0683cd1823511da99d2b8cba73a2d9e..60e30df87afde63d020f793f7361c374406a46b1 100644 (file)
--- 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)