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.

2 files changed, 3 insertions, 3 deletions

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 47f5e06d5..c86f1ed3f 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -39,7 +39,7 @@ eippSystem::eippSystem() : edspLikeSystem("Debian APT planner interface")
 }
 									/*}}}*/
 // System::Lock - Get the lock						/*{{{*/
-bool edspLikeSystem::Lock()
+bool edspLikeSystem::Lock(OpProgress *)
 {
    return true;
 }
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 33f06c4d5..97c2d66e2 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -29,7 +29,7 @@ protected:
    std::unique_ptr<pkgIndexFile> StatusFile;
 
 public:
-   virtual bool Lock() APT_OVERRIDE APT_PURE;
+   virtual bool Lock(OpProgress * const Progress) APT_OVERRIDE APT_PURE;
    virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE APT_PURE;
    virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE APT_PURE;
    virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
@@ -41,7 +41,7 @@ public:
    bool MultiArchSupported() const override { return true; }
    std::vector<std::string> ArchitecturesSupported() const override { return {}; };
 
-   bool LockInner() override { return _error->Error("LockInner is not implemented"); };
+   bool LockInner(OpProgress * const, int) override { return _error->Error("LockInner is not implemented"); };
    bool UnLockInner(bool) override { return _error->Error("UnLockInner is not implemented"); };
    bool IsLocked() override { return true; };