diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 16:03:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 16:03:03 +0200 |
| commit | 98c934f2723d63d00908803ad47ab1359081ec2d (patch) | |
| tree | df7c21f028089b99d63289d784ee5bd23d54d380 /apt-pkg/init.cc | |
| parent | a298a1dc595c548e6c10b48b8e69d987e5be1c42 (diff) | |
| parent | a11f6c973bc0dc226d8953e3edb6333d526c3143 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 3a35f852e..241628632 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -86,6 +86,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); |