Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / dpkgpm.cc

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 76b7083595992a98962604845d63459bdaff1ad3..2dcdf916fe7cebd5c7c6d47e79e505e3eea4c48c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1031,7 +1031,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
    }
 }
                                                                         /*}}}*/
    }
 }
                                                                         /*}}}*/

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)

 bool pkgDPkgPM::Go(int StatusFd)
 {
    APT::Progress::PackageManager *progress = NULL;
 bool pkgDPkgPM::Go(int StatusFd)
 {
    APT::Progress::PackageManager *progress = NULL;


@@ -1040,9 +1039,8 @@ bool pkgDPkgPM::Go(int StatusFd)
    else
       progress = new APT::Progress::PackageManagerProgressFd(StatusFd);
    
    else
       progress = new APT::Progress::PackageManagerProgressFd(StatusFd);
    

-   return GoNoABIBreak(progress);
+   return Go(progress);

 }
 }

-#endif

 
 void pkgDPkgPM::StartPtyMagic()
 {
 
 void pkgDPkgPM::StartPtyMagic()
 {


@@ -1114,11 +1112,7 @@ void pkgDPkgPM::StopPtyMagic()
  * through to human readable (and i10n-able)
  * names and calculates a percentage for each step.
  */
  * through to human readable (and i10n-able)
  * names and calculates a percentage for each step.
  */

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)

 bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)

-#else
-bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
-#endif

 {
    pkgPackageManager::SigINTStop = false;
    d->progress = progress;
 {
    pkgPackageManager::SigINTStop = false;
    d->progress = progress;