diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:10:55 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:10:55 +0100 |
| commit | 37adedc9d0b66eeae7efb88aebd08dfbc6e06f77 (patch) | |
| tree | b0769df88e2b6496f23e3d899aeb1c240a3488d9 /apt-pkg/init.cc | |
| parent | cf4f17a9d87a36b20ef5afa2cb5145e466d8ad3b (diff) | |
| parent | 04340db392f14e2610189db6f8787e10fbf3c6d0 (diff) | |
merged from lp:~donkult/apt/experimental
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/"); |