summaryrefslogtreecommitdiff
path: root/apt-pkg/init.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-07-15 23:57:07 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-07-15 23:57:07 +0200
commit6009e60d0192832277242438ad7ca2fc24a4c075 (patch)
treeca691ec88f3522952210a534df6551813b80778c /apt-pkg/init.cc
parent9d800312c90b7d3b52f2f4c3cea3ebfc67bf000b (diff)
display warnings instead of errors if the parts dirs doesn't exist
Parts dirs are /etc/apt/{sources.list,apt.conf,preferences}.d (in the default setup)
Diffstat (limited to 'apt-pkg/init.cc')
-rw-r--r--apt-pkg/init.cc17
1 files changed, 12 insertions, 5 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 4abfb726f..63caade36 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -81,19 +81,26 @@ bool pkgInitConfig(Configuration &Cnf)
// Read an alternate config file
const char *Cfg = getenv("APT_CONFIG");
- if (Cfg != 0 && FileExists(Cfg) == true)
- Res &= ReadConfigFile(Cnf,Cfg);
-
+ if (Cfg != 0)
+ {
+ if (FileExists(Cfg) == true)
+ Res &= ReadConfigFile(Cnf,Cfg);
+ else
+ _error->WarningE("FileExists",_("Unable to read %s"),Cfg);
+ }
+
// Read the configuration parts dir
string Parts = Cnf.FindDir("Dir::Etc::parts");
if (FileExists(Parts) == true)
Res &= ReadConfigDir(Cnf,Parts);
-
+ else
+ _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+
// Read the main config file
string FName = Cnf.FindFile("Dir::Etc::main");
if (FileExists(FName) == true)
Res &= ReadConfigFile(Cnf,FName);
-
+
if (Res == false)
return false;