diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-15 14:08:03 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-15 14:08:03 -0700 |
| commit | 9b2ab34c4c25487407c693e25916af6fdebb7484 (patch) | |
| tree | 1e0e7acc1bb6388e520ea0f71ccebc01043a9342 /pym/portage/dbapi/__init__.py | |
| parent | 045c2064c9c6a3bd64cda5ad38a56683fce78030 (diff) | |
| download | portage-9b2ab34c4c25487407c693e25916af6fdebb7484.tar.gz portage-9b2ab34c4c25487407c693e25916af6fdebb7484.tar.bz2 portage-9b2ab34c4c25487407c693e25916af6fdebb7484.zip | |
Remove questionable lockfile removal code in dbapi.invalidentry().
Diffstat (limited to 'pym/portage/dbapi/__init__.py')
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 505a4b158..99fb55723 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -9,7 +9,6 @@ import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.dbapi.dep_expand:dep_expand@_dep_expand', 'portage.dep:match_from_list', - 'portage.locks:unlockfile', 'portage.output:colorize', 'portage.util:cmp_sort_key,writemsg', 'portage.versions:catsplit,catpkgsplit,vercmp', @@ -185,14 +184,7 @@ class dbapi(object): yield cpv def invalidentry(self, mypath): - if mypath.endswith('portage_lockfile'): - if "PORTAGE_MASTER_PID" not in os.environ: - writemsg(_("Lockfile removed: %s\n") % mypath, 1) - unlockfile((mypath, None, None)) - else: - # Nothing we can do about it. We're probably sandboxed. - pass - elif '/-MERGING-' in mypath: + if '/-MERGING-' in mypath: if os.path.exists(mypath): writemsg(colorize("BAD", _("INCOMPLETE MERGE:"))+" %s\n" % mypath, noiselevel=-1) |