From 93e1565796b61eb44bec39f50e09a34cbe090178 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 26 Feb 2020 20:31:03 +0100 Subject: apt(8): Wait for frontend and cache lock This is a rework of !6 with additional stuff for the frontend lock, so we can lock the frontend lock and then keep looping over dpkg lock. --- apt-pkg/deb/debsystem.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'apt-pkg/deb/debsystem.h') diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index a331af351..2e5a8550c 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -27,8 +27,7 @@ class debSystem : public pkgSystem APT_HIDDEN bool CheckUpdates(); public: - - virtual bool Lock() APT_OVERRIDE; + virtual bool Lock(OpProgress *const Progress) APT_OVERRIDE; virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE; virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE; virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE; @@ -48,7 +47,7 @@ class debSystem : public pkgSystem bool MultiArchSupported() const override; std::vector ArchitecturesSupported() const override; - bool LockInner() override; + bool LockInner(OpProgress *const Progress, int timeoutSec) override; bool UnLockInner(bool NoErrors=false) override; bool IsLocked() override; }; -- cgit v1.2.3-70-g09d2