fix apt output ordering and update test to match the new human friendly messages...

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 5f1849b534f3f0a89febe4de4d7c7f9ad62a160e..a61f08d911b6a3cff0f499c6c4511315de6f46ee 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -668,14 +668,15 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
       // check if the package moved to the next dpkg state
       if(next_action && (action == next_action))
       {
       // check if the package moved to the next dpkg state
       if(next_action && (action == next_action))
       {

-         // we moved from one dpkg state to a new one, report that
-         PackageOpsDone[pkg]++;
-         PackagesDone++;
-

          // only read the translation if there is actually a next
          // action
          const char *translation = _(states[PackageOpsDone[pkg]].str);
          std::string msg;
          // only read the translation if there is actually a next
          // action
          const char *translation = _(states[PackageOpsDone[pkg]].str);
          std::string msg;

+
+         // we moved from one dpkg state to a new one, report that
+         PackageOpsDone[pkg]++;
+         PackagesDone++;
+

          strprintf(msg, translation, i18n_pkgname.c_str());
          d->progress->StatusChanged(pkgname, PackagesDone, PackagesTotal, msg);
          
          strprintf(msg, translation, i18n_pkgname.c_str());
          d->progress->StatusChanged(pkgname, PackagesDone, PackagesTotal, msg);
          


@@ -1505,7 +1506,6 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
    CloseLog();
 
    // dpkg is done at this point
    CloseLog();
 
    // dpkg is done at this point

-   d->progress->StatusChanged("", PackagesDone, PackagesTotal, "");

    d->progress->Stop();
 
    if (pkgPackageManager::SigINTStop)
    d->progress->Stop();
 
    if (pkgPackageManager::SigINTStop)

diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index 97bb2584844a7a3dbc13d2a96e9c199a97106e6f..9d250e949ef347030fba597fb732acd0c0fd282a 100755 (executable)
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -21,7 +21,7 @@ pmstatus:dpkg-exec:0:Running dpkg
 pmstatus:testing:0:Installing testing (amd64)
 pmstatus:testing:20:Preparing testing (amd64)
 pmstatus:testing:40:Unpacking testing (amd64)
 pmstatus:testing:0:Installing testing (amd64)
 pmstatus:testing:20:Preparing testing (amd64)
 pmstatus:testing:40:Unpacking testing (amd64)

-pmstatus:testing:60:Preparing to configure testing
+pmstatus:testing:60:Preparing to configure testing (amd64)

 pmstatus:dpkg-exec:60:Running dpkg
 pmstatus:testing:60:Configuring testing (amd64)
 pmstatus:testing:80:Configuring testing (amd64)
 pmstatus:dpkg-exec:60:Running dpkg
 pmstatus:testing:60:Configuring testing (amd64)
 pmstatus:testing:80:Configuring testing (amd64)


@@ -35,7 +35,7 @@ dlstatus:1:0:Retrieving file 1 of 1
 pmstatus:dpkg-exec:0:Running dpkg
 pmstatus:testing:20:Preparing testing (amd64)
 pmstatus:testing:40:Unpacking testing (amd64)
 pmstatus:dpkg-exec:0:Running dpkg
 pmstatus:testing:20:Preparing testing (amd64)
 pmstatus:testing:40:Unpacking testing (amd64)

-pmstatus:testing:60:Preparing to configure testing
+pmstatus:testing:60:Preparing to configure testing (amd64)

 pmstatus:dpkg-exec:60:Running dpkg
 pmstatus:testing:60:Configuring testing (amd64)
 pmstatus:testing:80:Configuring testing (amd64)
 pmstatus:dpkg-exec:60:Running dpkg
 pmstatus:testing:60:Configuring testing (amd64)
 pmstatus:testing:80:Configuring testing (amd64)