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

Fix wording of 'after unpacking'

bubulle@debian.org лет назад: 18
Родитель
Сommit
813603a05f
2 измененных файлов с 8 добавлено и 4 удалено
  1. 3 3
      cmdline/apt-get.cc
  2. 5 1
      debian/changelog

+ 3 - 3
cmdline/apt-get.cc

@@ -838,16 +838,16 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    if (DebBytes != FetchBytes)
       ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"),
 	       SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str());
-   else
+   else if (DebBytes != 0)
       ioprintf(c1out,_("Need to get %sB of archives.\n"),
 	       SizeToStr(DebBytes).c_str());
 
    // Size delta
    if (Cache->UsrSize() >= 0)
-      ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"),
+      ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"),
 	       SizeToStr(Cache->UsrSize()).c_str());
    else
-      ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"),
+      ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"),
 	       SizeToStr(-1*Cache->UsrSize()).c_str());
 
    if (_error->PendingError() == true)

+ 5 - 1
debian/changelog

@@ -53,7 +53,11 @@ apt (0.7.10) UNRELEASED; urgency=low
     - if RootDir is set, then FindFile and FindDir will return paths
       relative to the directory stored in RootDir, closes: #456457.
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Sun, 16 Dec 2007 18:46:29 -0200
+  [ Christian Perrier ]
+  * Fix wording for "After unpacking...". Thans to Michael Gilbert
+    for the patch. Closes: #260825
+
+ -- Christian Perrier <bubulle@debian.org>  Mon, 17 Dec 2007 10:10:17 +0530
 
 apt (0.7.9) unstable; urgency=low