diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-07-01 00:53:52 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-07-01 00:53:52 -0700 |
| commit | f807bb54317db5f8073f8904897cf4b9d87bf2cd (patch) | |
| tree | 7ca9992ec8b9a98942c293a374afac3489520614 /bin/quickpkg | |
| parent | d44df83d9f00405a62b25439ddc1915e6366a300 (diff) | |
| download | portage-f807bb54317db5f8073f8904897cf4b9d87bf2cd.tar.gz portage-f807bb54317db5f8073f8904897cf4b9d87bf2cd.tar.bz2 portage-f807bb54317db5f8073f8904897cf4b9d87bf2cd.zip | |
Support FEATURES={downgrade,unmerge}-backup
This will fix bug #156282 and bug #424275.
Diffstat (limited to 'bin/quickpkg')
| -rwxr-xr-x | bin/quickpkg | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/quickpkg b/bin/quickpkg index d908c0346..a6bd4d4bd 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -68,11 +68,14 @@ def quickpkg_atom(options, infos, arg, eout): bintree.prevent_collision(cpv) dblnk = vardb._dblink(cpv) have_lock = False - try: - dblnk.lockdb() - have_lock = True - except PermissionDenied: - pass + + if "__PORTAGE_INHERIT_VARDB_LOCK" not in settings: + try: + dblnk.lockdb() + have_lock = True + except PermissionDenied: + pass + try: if not dblnk.exists(): # unmerged by a concurrent process |