From: Zac Medico Date: Sun, 27 Mar 2011 20:57:35 +0000 (-0700) Subject: unmerge: fix lock/UnsupportedAPIException logic X-Git-Tag: v2.1.9.45 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e988ead0427787a40f2e9b0c4827d67b876bbda4;p=portage.git unmerge: fix lock/UnsupportedAPIException logic --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a9e8edef2..8ef71278e 100644 --- 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.