summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-25 14:41:35 +0200
committerMichael Vogt <mvo@debian.org>2014-04-25 14:50:39 +0200
commit6c50447eb443768764f83b3ba86ef32780ba6dde (patch)
tree7ac40ab4ee01f42b2e120042aafbf7c32d01a61c /apt-pkg
parent506ab3c78fb67f5e452a1748f4870af767de5ebb (diff)
downloadapt-6c50447eb443768764f83b3ba86ef32780ba6dde.tar.gz
reduce delta from ubuntu
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--apt-pkg/init.cc1
2 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index c3e7e1d1..c52b83c6 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1617,7 +1617,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
string::size_type pos;
FILE *report;
- if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
+ if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
{
std::clog << "configured to not write apport reports" << std::endl;
return;
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 3a35f852..24162863 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/");