summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2018-08-07 13:51:13 +0000
committerJulian Andres Klode <jak@debian.org>2018-08-07 13:51:13 +0000
commite165588b0b9bc7c484c91e324b6b9418b0a29457 (patch)
tree0e20b60cfc4e79ceebe916cef692ffa8cf7ec875 /apt-private
parent1ff389a5053e9ece91db8199afdcec16090a76b0 (diff)
parentc2c8b4787b0882234ba2772ec7513afbf97b563a (diff)
Merge branch 'bugfix/big-lock' into 'master'
Add support for dpkg frontend lock See merge request apt-team/apt!11
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-install.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index f90e7097f..4e888a9bd 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -346,7 +346,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
}
auto const progress = APT::Progress::PackageManagerProgressFactory();
- _system->UnLock();
+ _system->UnLockInner();
pkgPackageManager::OrderResult const Res = PM->DoInstall(progress);
delete progress;
@@ -355,7 +355,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
if (Res == pkgPackageManager::Completed)
break;
- _system->Lock();
+ _system->LockInner();
// Reload the fetcher object and loop again for media swapping
Fetcher.Shutdown();