diff options
| author | Michael Vogt <egon@debian-devbox> | 2011-10-14 11:54:12 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2011-10-14 11:54:12 +0200 |
| commit | 1d51f78e9d128191ff8b2d48e42d90ebdbff2588 (patch) | |
| tree | af05e41a53bcc9f22f146573ed0f1ff5311b97ad /apt-pkg/init.cc | |
| parent | 324fc8af296953857ebfc76deaadd4d224e081e3 (diff) | |
| parent | f3b8d8571faf62265266ac0f9da60ad73885214b (diff) | |
merged from lp:~donkult/apt/sid
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 38a0814e5..b283e2dd9 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -81,13 +81,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/"); |