diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-07-25 10:52:42 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-07-25 11:07:20 +0200 |
| commit | 91cdf3199cb8487eb38a14e2d1d5195ebe51e802 (patch) | |
| tree | c2fed3e59de86cded3c558c3a7f51f137730f8a6 /apt-pkg/packagemanager.cc | |
| parent | 938bf2aa08a57dadfd95869a0a93946269a06076 (diff) | |
bump next-abi check above gcc5-abi bump
Some of the 'simpler' abi changes are included in /sid already guarded
behind #if's and now that we dumped the ABI fpr gcc5 they trigger.
It would probably not hurt to have them trigger and it is an abi break
anyway, but there isn't much point to it and it would be really annoying
if one of them turns out to be a problem as these changes aren't as well
tested as the 'old' abi.
It is slightly incorrect to check for abi >= 17 as /experimental with
this (and other changes) is abi = 15 currently, but writing the correct
check would be just too insane for this dead ends branch. Final
/experimental is probably better of increasing APT_PKG_MAJOR anyhow.
Diffstat (limited to 'apt-pkg/packagemanager.cc')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 4226a3686..7e91b4801 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1059,7 +1059,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() // PM::DoInstallPostFork - compat /*{{{*/ // --------------------------------------------------------------------- /*}}}*/ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) pkgPackageManager::OrderResult pkgPackageManager::DoInstallPostFork(int statusFd) { @@ -1096,7 +1096,7 @@ pkgPackageManager::DoInstallPostFork(int statusFd) // PM::DoInstall - Does the installation /*{{{*/ // --------------------------------------------------------------------- /* compat */ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { @@ -1120,7 +1120,7 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) pkgPackageManager::OrderResult pkgPackageManager::DoInstall(APT::Progress::PackageManager *progress) { |