Fix wording of 'after unpacking'

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 486e995cc8343a7e93e6d0ab28f001bfa0699308..53c657e8a748132508a53ea10ffb36a1aa39879d 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/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());
    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,_("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
               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)
               SizeToStr(-1*Cache->UsrSize()).c_str());
 
    if (_error->PendingError() == true)

diff --git a/debian/changelog b/debian/changelog
index d8ce744d6dc50f11a96b988b96e2d036205acd45..9e74d5a0adc56791959f09ea813c261317b24d1f 100644 (file)
--- a/debian/changelog
+++ b/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.
 
     - 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
 
 
 apt (0.7.9) unstable; urgency=low