Fixed list notation doc bug and 'b' vs 'B'

Author: jgg
Date: 1999-06-06 05:52:37 GMT
Fixed list notation doc bug and 'b' vs 'B'

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index a5383a8..5e88d3c 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acqprogress.cc,v 1.13 1999/04/20 05:59:29 jgg Exp $
+// $Id: acqprogress.cc,v 1.14 1999/06/06 05:52:37 jgg Exp $
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
@@ -48,7 +48,7 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    
    cout << "Hit " << Itm.Description;
    if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "b]";
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
    Update = true;
 };
@@ -72,7 +72,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    
    cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
    if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "b]";
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
 };
                                                                        /*}}}*/
@@ -122,9 +122,9 @@ void AcqTextStatus::Stop()
       cout << '\r' << BlankLine << '\r';
    
    if (FetchedBytes != 0)
-      cout << "Fetched " << SizeToStr(FetchedBytes) << "b in " <<
+      cout << "Fetched " << SizeToStr(FetchedBytes) << "B in " <<
          TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) << 
-         "b/s)" << endl;
+         "B/s)" << endl;
 }
                                                                        /*}}}*/
 // AcqTextStatus::Pulse - Regular event pulse                          /*{{{*/
@@ -189,7 +189,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       else
       {
         if (Mode == Medium || I->TotalSize == 0)
-           snprintf(S,End-S," %sb",SizeToStr(I->CurrentSize).c_str());
+           snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
       }
       S += strlen(S);
       
@@ -200,7 +200,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
            snprintf(S,End-S," %lu%%",
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
         else
-           snprintf(S,End-S,"/%sb %lu%%",SizeToStr(I->TotalSize).c_str(),
+           snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);
@@ -222,7 +222,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    {      
       char Tmp[300];
       unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
-      sprintf(Tmp," %sb/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
+      sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
       unsigned int Len = strlen(Buffer);
       unsigned int LenT = strlen(Tmp);
       if (Len + LenT < ScreenWidth)

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index c626a1e..3de59ae 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-config.cc,v 1.5 1999/05/23 05:45:12 jgg Exp $
+// $Id: apt-config.cc,v 1.6 1999/06/06 05:52:37 jgg Exp $
 /* ######################################################################
    
    APT Config - Program to manipulate APT configuration files
@@ -48,6 +48,15 @@ bool DoShell(CommandLine &CmdL)
         cout << *I << "=\"" << _config->Find(I[1]) << '"' << endl;
    }
    
+   return true;
+}
+                                                                       /*}}}*/
+// DoDump - Dump the configuration space                               /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool DoDump(CommandLine &CmdL)
+{
+   _config->Dump();
    return true;
 }
                                                                        /*}}}*/
@@ -67,6 +76,7 @@ int ShowHelp()
    cout << endl;
    cout << "Commands:" << endl;
    cout << "   shell - Shell mode" << endl;
+   cout << "   dump - Show the configuration" << endl;
    cout << endl;
    cout << "Options:" << endl;
    cout << "  -h   This help text." << endl;
@@ -85,6 +95,7 @@ int main(int argc,const char *argv[])
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};
    CommandLine::Dispatch Cmds[] = {{"shell",&DoShell},
+                                   {"dump",&DoDump},
                                    {0,0}};
    
    // Parse the command line and initialize the package library

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 585026a..a40b8a4 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-get.cc,v 1.63 1999/06/05 07:30:18 jgg Exp $
+// $Id: apt-get.cc,v 1.64 1999/06/06 05:52:37 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -525,17 +525,17 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey =
    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)
-      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';
+      c1out << SizeToStr(FetchBytes) << "B/" << SizeToStr(DebBytes) << 'B';
    else
-      c1out << SizeToStr(DebBytes) << 'b';
+      c1out << SizeToStr(DebBytes) << 'B';
       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)
-      c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl;
+      c1out << SizeToStr(Cache->UsrSize()) << "B will be used." << endl;
    else
-      c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl;
+      c1out << SizeToStr(-1*Cache->UsrSize()) << "B will be freed." << endl;
 
    if (_error->PendingError() == true)
       return false;
@@ -1024,7 +1024,7 @@ class LogCleaner : public pkgArchiveCleaner
    protected:
    virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) 
    {
-      cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "b]" << endl;
+      cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << endl;
    };
 };
 
@@ -1194,9 +1194,9 @@ bool DoSource(CommandLine &CmdL)
    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)
-      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';
+      c1out << SizeToStr(FetchBytes) << "B/" << SizeToStr(DebBytes) << 'B';
    else
-      c1out << SizeToStr(DebBytes) << 'b';
+      c1out << SizeToStr(DebBytes) << 'B';
    c1out << " of source archives." << endl;
 
    if (_config->FindB("APT::Get::Simulate",false) == true)

diff --git a/debian/changelog b/debian/changelog
index 6136fa9..4ed4424 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ apt (0.3.6.1) unstable; urgency=low
   * Fixed typo in apt-get help. Closes: #38712
   * Improved the error message in the case of broken held package. Closes: #38777
   * Fixed handling of MD5 failures
+  * Documented list notation Closes: #39008
+  * Change the 'b' to 'B'. Closes: #39007 
   
  -- Jason Gunthorpe <jgg@debian.org>  Wed, 12 May 1999 09:18:49 -0700
  

diff --git a/debian/postinst b/debian/postinst
index 87476bf..d1b46d1 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -18,8 +18,9 @@ create_apt_conf ()
 # Use for a local mirror - remove the ftp1 http lines for the bits
 # your mirror contains.
 # deb file:/your/mirror/here/debian stable main contrib non-free
-# See sources.list(5) for more information, especial
+# See sources.list(5) for more information, especialy
 # Remember that you can only use http, ftp or file URIs
+# CDROMs are managed throught the apt-cdrom tool.
 deb http://http.us.debian.org/debian stable main contrib non-free
 deb http://non-us.debian.org/debian-non-US stable non-US
 

diff --git a/doc/apt-config.8.yo b/doc/apt-config.8.yo
index 93da329..809c790 100644 (file)
--- a/doc/apt-config.8.yo
+++ b/doc/apt-config.8.yo
@@ -14,6 +14,7 @@ applications.
 em(command) is one of:
 itemize(
   it() shell
+  it() dump
 )
 
 Unless the -h, or --help option is given one of the above commands
@@ -41,6 +42,9 @@ MyApp::Options with a default of -f.
 If the configuration item to retrieve is prefixed with a / then it will
 be retrieved using filename mode which prepends base paths.
 
+dit(bf(dump))
+Just show the contents of the configuration space.
+
 enddit()
 
 manpageoptions()

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 96b2e7d..4eee5d0 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -30,9 +30,17 @@ verb(APT {
 };
 )
 with newlines placed to make
-it more readable. In general the sample configuration file in
+it more readable. Lists can be created by opening a scope an including a 
+single word enclosed in quotes followed by a semicolon. 
+In general the sample configuration file in
 em(/usr/doc/apt/examples/apt.conf) is a good guide for how it should look.
 
+All of the APT tools take a -o option which allows an arbitary configuration 
+directive to be specified on the command line. The syntax is a full option
+name (APT::Get::Assume-Yes for instance) followed by an equals sign then the
+new value of the option. Lists can be appended too by adding a trailing ::
+to the list name.
+
 manpagesection(The APT Group)
 This group of options controls general APT behavoir as well as holding the
 options for all of the tools.