summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-07-24 17:34:30 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-07-24 17:34:30 +0200
commit3b216cf6b6e082b7de4dfece65601a96d269d529 (patch)
treeda4f87625817bc1d1ec589291d331528e55ccbd6 /apt-pkg/deb
parent439b024abe8fd6b8227a8b2869aab65a1186cfda (diff)
updated for the gcc5 transition
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc11
-rw-r--r--apt-pkg/deb/dpkgpm.h2
2 files changed, 13 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 82e045fd3..d17734fdc 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1068,6 +1068,17 @@ bool pkgDPkgPM::Go(int StatusFd)
return GoNoABIBreak(progress);
}
+#else
+bool pkgDPkgPM::Go(int StatusFd)
+{
+ APT::Progress::PackageManager *progress = NULL;
+ if (StatusFd == -1)
+ progress = APT::Progress::PackageManagerProgressFactory();
+ else
+ progress = new APT::Progress::PackageManagerProgressFd(StatusFd);
+
+ return Go(progress);
+}
#endif
void pkgDPkgPM::StartPtyMagic()
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 2c1805015..e60f5fc3b 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -135,6 +135,8 @@ class pkgDPkgPM : public pkgPackageManager
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
virtual bool Go(APT::Progress::PackageManager *progress);
+ // compat
+ virtual bool Go(int StatusFd=-1);
#else
virtual bool Go(int StatusFd=-1);
bool GoNoABIBreak(APT::Progress::PackageManager *progress);