summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-10-05 15:21:47 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-10-05 15:21:47 +0200
commit6f2f5f4afa6f628ad3d068e9ba55fc6455eefa12 (patch)
treed360bbbdff678c19142facabc46f30f693fe32e9 /cmdline/apt-get.cc
parent1f5a2d63b784eb919143d0be3f2dee7ff0bb7e83 (diff)
parent56e47f3111ad714c6506c0d60dccb92cfc9311cb (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6d9ba2b05..2f542d1db 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -138,7 +138,7 @@ static bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
// helper that can go wit hthe next ABI break
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 17)
static std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
{
// FIXME: this cast is the horror, the horror
@@ -175,7 +175,7 @@ static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
{
if (&CurrentIndexFile == (*IF))
{
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 17)
std::string path = MetaIndexFileNameOnDisk(*S);
#else
std::string path = (*S)->LocalFileName();