diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
| commit | 89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9 (patch) | |
| tree | 258687a5f0984f0b4edd24b52d778cf4d21c7059 /apt-pkg/init.cc | |
| parent | cd5e84440a9bb75a9cc2c142ac8bc214ba57685a (diff) | |
| parent | 0a64ecd792b4caca519d597a69b8baeda6a1bf77 (diff) | |
| download | apt-89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9.tar.gz | |
merge with my debian-sid branch
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 2a709dd36..a1c47c030 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -86,13 +86,12 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Dir::Log::Terminal","term.log"); Cnf.CndSet("Dir::Log::History","history.log"); - if (Cnf.Exists("Dir::Ignore-Files-Silently") == false) - { - 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]+$"); - } + 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]+$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); |