Просмотр исходного кода

* 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)

Bogdan Purcareata лет назад: 14
Родитель
Сommit
de3786516d
3 измененных файлов с 8 добавлено и 4 удалено
  1. 1 1
      cmdline/apt-get.cc
  2. 5 1
      debian/changelog
  3. 2 2
      test/integration/test-bug-604222-new-and-autoremove

+ 1 - 1
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;
 }

+ 5 - 1
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
 

+ 2 - 2
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: