_config->Dump is now inlined, and calls Dump(clog). Du...

Author: doogie
Date: 2002-11-09 17:11:25 GMT
_config->Dump is now inlined, and calls Dump(clog).  Dump(ostream&) is now
exported.  Fixed apt-config dump sending to stderr.

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index bc48ddefd6914378eb398d0f38a743a2cd39c20e..18d6cd9ab070a91804f7d29e07d3eecf514764bb 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.cc,v 1.23 2002/09/14 05:29:22 jgg Exp $
+// $Id: configuration.cc,v 1.24 2002/11/09 17:11:25 doogie Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -397,14 +397,14 @@ bool Configuration::ExistsAny(const char *Name) const
 // Configuration::Dump - Dump the config                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Dump the entire configuration space */
 // Configuration::Dump - Dump the config                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Dump the entire configuration space */

-void Configuration::Dump()
+void Configuration::Dump(ostream& str)

 {
    /* Write out all of the configuration directives by walking the 
       configuration tree */
    const Configuration::Item *Top = Tree(0);
    for (; Top != 0;)
    {
 {
    /* Write out all of the configuration directives by walking the 
       configuration tree */
    const Configuration::Item *Top = Tree(0);
    for (; Top != 0;)
    {

-      clog << Top->FullTag() << " \"" << Top->Value << "\";" << endl;
+      str << Top->FullTag() << " \"" << Top->Value << "\";" << endl;

       
       if (Top->Child != 0)
       {
       
       if (Top->Child != 0)
       {

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index bc2b0fd15c65f15a114d600f836d6a8c2229119e..418e210bc3c286b1d5940ec9b46725b0576d4c0b 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.h,v 1.14 2001/05/07 05:06:52 jgg Exp $
+// $Id: configuration.h,v 1.15 2002/11/09 17:11:25 doogie Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -33,6 +33,7 @@
 #endif 
 
 #include <string>
 #endif 
 
 #include <string>

+#include <iostream>

 
 using std::string;
 
 
 using std::string;
 


@@ -90,7 +91,8 @@ class Configuration
    
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
    
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 

-   void Dump();
+   inline void Dump() { Dump(clog); };
+   void Dump(ostream& str);

 
    Configuration(const Item *Root);
    Configuration();
 
    Configuration(const Item *Root);
    Configuration();

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index d9b1ff00e050277839ae893b2a30ec09bb4a0d54..9a937a10fe76c9fa17327131f7047d7a67c30581 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-config.cc,v 1.9 2002/02/15 03:40:00 jgg Exp $
+// $Id: apt-config.cc,v 1.10 2002/11/09 17:11:25 doogie Exp $

 /* ######################################################################
    
    APT Config - Program to manipulate APT configuration files
 /* ######################################################################
    
    APT Config - Program to manipulate APT configuration files


@@ -57,7 +57,7 @@ bool DoShell(CommandLine &CmdL)
 /* */
 bool DoDump(CommandLine &CmdL)
 {
 /* */
 bool DoDump(CommandLine &CmdL)
 {

-   _config->Dump();
+   _config->Dump(cout);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 1c2db6ec44bc43eea359603d83363dba31c1c894..7caad06f5fbf5b8e0625d337c7e2ee3c292a2371 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ apt (0.5.5) unstable; urgency=low
   * i18n gettext stuff, based on work from Michael Piefel
   * Some highly unlikely memory faults. Closes: #155842
   * C++ stuff for G++3.2. Closes: #162617
   * i18n gettext stuff, based on work from Michael Piefel
   * Some highly unlikely memory faults. Closes: #155842
   * C++ stuff for G++3.2. Closes: #162617

+  * apt-config dumps sends to stdout not stderr now.  Closes: #146294

 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600
 
 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600