add new ClearAll

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 36866a35ad2a85e846809f716faccf2d7c5b98b7..43533e5bb03b059f71ecbb8c7ac83470c0013d59 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -403,6 +403,17 @@ void Configuration::Clear(string const &Name, string const &Value)
       }
    }
      
       }
    }
      

+}
+                                                                       /*}}}*/
+// Configuration::ClearAll - Clear everything                          /*{{{*/
+void Configuration::ClearAll()
+{
+   const Configuration::Item *Top = Tree(0);
+   while( Top != 0 )
+   {
+      Clear(Top->FullTag());
+      Top = Top->Next;
+   }

 }
                                                                        /*}}}*/
 // Configuration::Clear - Clear an entire tree                         /*{{{*/
 }
                                                                        /*}}}*/
 // Configuration::Clear - Clear an entire tree                         /*{{{*/

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 4c2e750413852e32586b73410452d78bded66d04..181ef696b840dc275bc34004bec03bd4e3afa262 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -94,6 +94,7 @@ class Configuration
 
    // clear a whole tree
    void Clear(const std::string &Name);
 
    // clear a whole tree
    void Clear(const std::string &Name);

+   void ClearAll();

 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
    void Clear(std::string const &List, std::string const &Value);
 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
    void Clear(std::string const &List, std::string const &Value);

diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 9a3e2c11865c1253b2ccde0afe847e9120d505ae..5ec48834a74400520158771d1a3c0af53ec89b34 100644 (file)
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -80,6 +80,10 @@ int main(int argc,const char *argv[]) {
        equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
        equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
 
        equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
        equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
 

+        Cnf.Set("Moo::Bar", "1");
+        Cnf.ClearAll();
+        equals(Cnf.Find("Moo::Bar"), "");
+

        //FIXME: Test for configuration file parsing;
        // currently only integration/ tests test them implicitly
 
        //FIXME: Test for configuration file parsing;
        // currently only integration/ tests test them implicitly