summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/configuration.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-08 22:47:24 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-08 22:47:24 +0100
commita74cd17ab62821d2cbaa4475dcffc3e11c08b2b7 (patch)
treea41ec0a8e19fc1da0cb8aaef5d3e419944a614c3 /apt-pkg/contrib/configuration.cc
parent9ba25fb7d6ae555a6cdf8772ed49f00bde90af41 (diff)
fix merge error
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
-rw-r--r--apt-pkg/contrib/configuration.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 08faf22b5..aaa669ffc 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -829,6 +829,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
// ReadConfigDir - Read a directory of config files /*{{{*/
// ---------------------------------------------------------------------
/* */
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+ bool AsSectional, unsigned Depth)
{
vector<string> const List = GetListOfFilesInDir(Dir, "", true);