diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
| commit | 6f2f5f4afa6f628ad3d068e9ba55fc6455eefa12 (patch) | |
| tree | d360bbbdff678c19142facabc46f30f693fe32e9 /apt-private/private-install.cc | |
| parent | 1f5a2d63b784eb919143d0be3f2dee7ff0bb7e83 (diff) | |
| parent | 56e47f3111ad714c6506c0d60dccb92cfc9311cb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'apt-private/private-install.cc')
| -rw-r--r-- | apt-private/private-install.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 4e201c60b..871e437b7 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -96,7 +96,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) { pkgSimulate PM(Cache); -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory(); pkgPackageManager::OrderResult Res = PM.DoInstall(progress); delete progress; @@ -333,7 +333,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) _system->UnLock(); -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory(); pkgPackageManager::OrderResult Res = PM->DoInstall(progress); delete progress; |