summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/debsystem.h
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2020-02-26 20:31:03 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2020-02-26 20:36:52 +0100
commit93e1565796b61eb44bec39f50e09a34cbe090178 (patch)
treeebb655eb7496799009b672c39799f670a596eb3e /apt-pkg/deb/debsystem.h
parentdb678df196ccd8f9f6fb336706cf5701d1e53aa6 (diff)
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.
Diffstat (limited to 'apt-pkg/deb/debsystem.h')
-rw-r--r--apt-pkg/deb/debsystem.h5
1 files changed, 2 insertions, 3 deletions
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<std::string> ArchitecturesSupported() const override;
- bool LockInner() override;
+ bool LockInner(OpProgress *const Progress, int timeoutSec) override;
bool UnLockInner(bool NoErrors=false) override;
bool IsLocked() override;
};