summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogdan Purcareata <bogdan.purcareata@gmail.com>2012-04-05 12:03:37 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-04-05 12:03:37 +0200
commitde3786516df8b0fec2f759a16bbbc4b8605c1856 (patch)
treee17c8c0e095dfa6fa815add54efe7441c636a77e
parent6e8b4572fb7d3e575821fe8799ded1c865cd866f (diff)
* cmdline/apt-get.cc:
- distinguish information about 'apt-get autoremove' based on the number of auto-removed packages both before and after the list of packages (Closes: #665833)
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog6
-rwxr-xr-xtest/integration/test-bug-604222-new-and-autoremove4
3 files changed, 8 insertions, 4 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ac1566f30..52618ae28 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1826,7 +1826,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
else
ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n",
"%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount);
- c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
+ c1out << P_("Use 'apt-get autoremove' to remove it.", "Use 'apt-get autoremove' to remove them.", autoRemoveCount) << std::endl;
}
return true;
}
diff --git a/debian/changelog b/debian/changelog
index d6913b003..fe92378dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,8 +63,12 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low
[ Bogdan Purcareata ]
* doc/apt-get.8.xml:
- add 'download' to the usage line (Closes: #649340)
+ * cmdline/apt-get.cc:
+ - distinguish information about 'apt-get autoremove' based on the
+ number of auto-removed packages both before and after the list
+ of packages (Closes: #665833)
- -- David Kalnischkies <kalnischkies@gmail.com> Thu, 05 Apr 2012 11:22:34 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 05 Apr 2012 11:55:30 +0200
apt (0.8.16~exp13) experimental; urgency=low
diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index 2875d547a..5820fb0dc 100755
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -16,7 +16,7 @@ Building dependency tree...
Reading state information...
The following package was automatically installed and is no longer required:
libvtk5.4
-Use 'apt-get autoremove' to remove them.
+Use 'apt-get autoremove' to remove it.
The following NEW packages will be installed:
libavcodec52
0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -28,7 +28,7 @@ Building dependency tree...
Reading state information...
The following package was automatically installed and is no longer required:
libvtk5.4
-Use 'apt-get autoremove' to remove them.
+Use 'apt-get autoremove' to remove it.
The following extra packages will be installed:
libavcodec52 libopenal-dev libvtk5.4
The following NEW packages will be installed: