From 645183375243ce4b7bd1b6fd2f4b9f925d6cbbc2 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 6 Jan 2012 15:08:22 +0100
Subject: apt-pkg/init.cc: restore ignore of .distUpgrade extension that got
 lost in the merge

---
 apt-pkg/init.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a1c47c030..4c15858a1 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -92,6 +92,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/");
-- 
cgit v1.2.3