HCoop
/
ntk
/
apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ba25fb
)
fix merge error
author
Michael Vogt
<michael.vogt@ubuntu.com>
Fri, 8 Jan 2010 21:47:24 +0000
(22:47 +0100)
committer
Michael Vogt
<michael.vogt@ubuntu.com>
Fri, 8 Jan 2010 21:47:24 +0000
(22:47 +0100)
apt-pkg/contrib/configuration.cc
patch
|
blob
|
blame
|
history
diff --git
a/apt-pkg/contrib/configuration.cc
b/apt-pkg/contrib/configuration.cc
index
08faf22
..
aaa669f
100644
(file)
--- 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);