diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-07-24 10:25:31 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-07-24 10:25:31 +0200 |
| commit | 2061c8671f05741291ed1c77418fa583cfd05d41 (patch) | |
| tree | cb7c55a92e280bbaf78b001e4a1809d28f45ac71 | |
| parent | d88b70b8e73e9bee5d72a69539b4b9be7ba34814 (diff) | |
* apt-pkg/packagemanager.h:
- re-add incorrectly removed pkgPackageManager::Go() to make
python-apt build again
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.h | 1 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.h | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
4 files changed, 14 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 82e045fd3..535db5e9a 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1057,7 +1057,8 @@ void pkgDPkgPM::BuildPackagesProgressMap() ++PackagesTotal; } /*}}}*/ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) + +// compat bool pkgDPkgPM::Go(int StatusFd) { APT::Progress::PackageManager *progress = NULL; @@ -1066,9 +1067,8 @@ bool pkgDPkgPM::Go(int StatusFd) else progress = new APT::Progress::PackageManagerProgressFd(StatusFd); - return GoNoABIBreak(progress); + return Go(progress); } -#endif void pkgDPkgPM::StartPtyMagic() { diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 2c1805015..733962bdc 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -135,6 +135,7 @@ class pkgDPkgPM : public pkgPackageManager #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) virtual bool Go(APT::Progress::PackageManager *progress); + virtual bool Go(int StatusFd=-1); #else virtual bool Go(int StatusFd=-1); bool GoNoABIBreak(APT::Progress::PackageManager *progress); diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 96fbbbaea..34b4b529f 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -99,6 +99,8 @@ class pkgPackageManager : protected pkgCache::Namespace virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;}; #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;}; + // compat + virtual bool Go(int /*statusFd*/=-1) {return true;}; #else virtual bool Go(int /*statusFd*/=-1) {return true;}; #endif diff --git a/debian/changelog b/debian/changelog index 2f111ac7a..64ef12c04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (1.0.9.10ubuntu5) wily; urgency=medium + + * apt-pkg/packagemanager.h: + - re-add incorrectly removed pkgPackageManager::Go() to make + python-apt build again + + -- Michael Vogt <mvo@ubuntu.com> Fri, 24 Jul 2015 10:13:08 +0200 + apt (1.0.9.10ubuntu4) wily; urgency=medium * abi bump for gcc-5 |