summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-21 21:24:32 +0200
committerMichael Vogt <mvo@debian.org>2013-10-21 21:24:32 +0200
commitd274520ee8d174aa9f062f2fbb2c4d117a121dd8 (patch)
treed416064a97a42991e450b6a4800bb7479df8bfbf /apt-pkg/deb
parent1c6cedc489b5eaeed1b7fdb845eca06bc1fccd4f (diff)
fix apt output ordering and update test to match the new human friendly messages that include the architecture
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc10
1 files changed, 5 insertions, 5 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)