diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-21 21:24:32 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-21 21:24:32 +0200 |
| commit | d274520ee8d174aa9f062f2fbb2c4d117a121dd8 (patch) | |
| tree | d416064a97a42991e450b6a4800bb7479df8bfbf | |
| parent | 1c6cedc489b5eaeed1b7fdb845eca06bc1fccd4f (diff) | |
fix apt output ordering and update test to match the new human friendly messages that include the architecture
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 10 | ||||
| -rwxr-xr-x | test/integration/test-apt-progress-fd | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 5f1849b53..a61f08d91 100644 --- 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)) { - // 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; + + // 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); @@ -1505,7 +1506,6 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) CloseLog(); // dpkg is done at this point - d->progress->StatusChanged("", PackagesDone, PackagesTotal, ""); d->progress->Stop(); if (pkgPackageManager::SigINTStop) diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index 97bb25848..9d250e949 100755 --- 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: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) @@ -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: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) |