diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-21 19:37:31 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-21 19:37:31 +0200 |
| commit | a91cb9542572fe5aa279db5ac5d28465bec1905f (patch) | |
| tree | af400efa4fb89efdb439dcaba6967f00c9746e2d | |
| parent | 404528bd581a4d2fa3bae1834d6fde48c6153434 (diff) | |
* apt-pkg/init.cc:
- silently ignore *.orig and *.save files by default
| -rw-r--r-- | apt-pkg/init.cc | 13 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 9 insertions, 8 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/"); diff --git a/debian/changelog b/debian/changelog index 147a7ec78..3c895813f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,10 @@ apt (0.8.15.9) UNRELEASED; urgency=low statisfying garbage package dependencies (Closes: #640590) * apt-pkg/algorithms.cc: - if a package is garbage, don't try to save it with FixByInstall + * apt-pkg/init.cc: + - silently ignore *.orig and *.save files by default - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 14 Sep 2011 21:01:56 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 21 Sep 2011 19:36:45 +0200 apt (0.8.15.8) unstable; urgency=low |