From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 7 Sep 2010 07:26:31 +0000 (+0200)
Subject: * apt-pkg/init.cc:
X-Git-Tag: 0.9.13.exp1ubuntu1~266
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/debca0004bc8b57e487a5a8ffdec51b54ae2f22a

* 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 846b27313..07bbe7061 100644
--- 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 4ad74b0f4..922aebb61 100644
--- 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