diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:29:44 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:29:44 +0200 |
| commit | a521ca5d3fc6619529843779ea46500fa6e69e14 (patch) | |
| tree | d6134e25dad5550e75768f8c9fbaabe75d81e541 /apt-pkg/init.cc | |
| parent | 34904390bd6901f3de90249938baa0b875873534 (diff) | |
| parent | 7abfcfbe8518d1b5cc79e967c3ac16c2f783d6ea (diff) | |
merged from experimental-apt-for-ubuntu
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index e2f847ed2..7a332c86e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -78,6 +78,11 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Log::Terminal","term.log"); Cnf.Set("Dir::Log::History","history.log"); + Cnf.Set("Dir::Ignore-Files-Silently::", "~$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); + // Translation Cnf.Set("APT::Acquire::Translation", "environment"); @@ -95,10 +100,10 @@ bool pkgInitConfig(Configuration &Cnf) // Read the configuration parts dir string Parts = Cnf.FindDir("Dir::Etc::parts"); - if (FileExists(Parts) == true) + if (DirectoryExists(Parts) == true) Res &= ReadConfigDir(Cnf,Parts); else - _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); + _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str()); // Read the main config file string FName = Cnf.FindFile("Dir::Etc::main"); |