* apt-pkg/init.cc:

  - ignore ".distUpgrade" and ".save" files in sources.list.d
    (LP: #631770)

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 846b273134a9cf8a90974d45df81f65cc80836c1..07bbe70617e1575b591674ff60724581747adadf 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -85,6 +85,9 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+   // ubuntu specific
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");

diff --git a/debian/changelog b/debian/changelog
index 4ad74b0f4e44e7c5a3a06a571fef9d3013291303..922aebb6125366e618a1a6fbcd1431d6d9438a40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ apt (0.8.0ubuntu4) unstable; urgency=low
 
   * debian/rules:
     - put ubuntu-archive.gpg back into the package (LP: #620576)
+  * apt-pkg/init.cc:
+    - ignore ".distUpgrade" and ".save" files in sources.list.d
+      (LP: #631770)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 19:49:54 +0200