unmerge: fix lock/UnsupportedAPIException logic

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a9e8edef21cd4a703ef5eb4de56b555158e004cf..8ef71278e63da2ceb78fe679aaf06f6d636d42fa 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1669,7 +1669,7 @@ class dblink(object):
                                                elog_process(self.mycpv, self.settings,
                                                        phasefilter=('prerm', 'postrm'))
 
-                                       if retval == os.EX_OK:
+                                       if retval == os.EX_OK and builddir_lock is not None:
                                                # myebuildpath might be None, so ensure
                                                # it has a sane value for the clean phase,
                                                # even though it won't really be sourced.