PackageUninstall: return early if pkg is missing

diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py
index 0e913071398e155136fdb978dfaf11ed02d9ce06..c846dab7768e2af2bfddd4a5f1dc01928e05c0c5 100644 (file)
--- a/pym/_emerge/PackageUninstall.py
+++ b/pym/_emerge/PackageUninstall.py
@@ -15,6 +15,16 @@ class PackageUninstall(CompositeTask):
 
        def _start(self):
 
+               vardb = self.pkg.root_config.trees["vartree"].dbapi
+               dbdir = vardb.getpath(self.pkg.cpv)
+               if not os.path.exists(dbdir):
+                       # Apparently the package got uninstalled
+                       # already, so we can safely return early.
+                       self.returncode = os.EX_OK
+                       self.wait()
+                       return
+
+               self.settings.setcpv(self.pkg)
                retval, pkgmap = _unmerge_display(self.pkg.root_config,
                        self.opts, "unmerge", [self.pkg.cpv], clean_delay=0,
                        writemsg_level=self._writemsg_level)