Make myopts["--exclude"] a plain string in order to avoid issues with mtimedb
authorZac Medico <zmedico@gentoo.org>
Wed, 5 May 2010 07:23:34 +0000 (00:23 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 5 May 2010 07:23:34 +0000 (00:23 -0700)
unpickling.

pym/_emerge/depgraph.py
pym/_emerge/main.py

index 3164e339ee4ec25f496ee9fcc2e7cdc7244de707..79fa508a10c8dbb7e55d0687d8f9f1f45913279f 100644 (file)
@@ -94,7 +94,11 @@ class _frozen_depgraph_config(object):
                self._required_set_names = set(["world"])
 
                self.excluded_pkgs = InternalPackageSet()
-               for x in myopts.get("--exclude", []):
+               for x in myopts.get("--exclude", "").split():
+                       try:
+                               x = Atom(x)
+                       except portage.exception.InvalidAtom:
+                               x = Atom("null/" + x)
                        cat = x.cp.split("/")[0]
                        if cat == "null":
                                pkgname = x.cp.split("/")[1]
index 66c6e037a9d22189837780dfec29096685e11c2d..9f7a20da5ee9bdf7204a31eeda66b2f42472bf6e 100644 (file)
@@ -757,8 +757,6 @@ def parse_opts(tmpcmdline, silent=False):
                        parser.error("Invalid Atom(s) in --exclude parameter: '%s' (only package names and slot atoms allowed)\n" % \
                                (",".join(bad_atoms),))
 
-               myoptions.exclude = exclude
-
        if myoptions.fail_clean == "True":
                myoptions.fail_clean = True