summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-03-07 17:33:54 +0100
committerJulian Andres Klode <jak@debian.org>2017-04-25 20:55:09 +0200
commit0c42bab8534b4dc95dabdff2a8e08a3574291ec0 (patch)
treead920b5287c9299677610fd255845498e0acef7f
parenta69b2560b8e882300df658b5505cc9490ab410d1 (diff)
downloadapt-0c42bab8534b4dc95dabdff2a8e08a3574291ec0.tar.gz
Ignore \.ucf-[a-z]+$ like we do for \.dpkg-[a-z]+$
This gets rid of warnings about .ucf-dist files Reported-By: Axel Beckert (on IRC) (cherry picked from commit 5094697fe4b2459ff6f706a22006d3028369f3fa)
-rw-r--r--apt-pkg/init.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 292d75071..47a1adad8 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -84,6 +84,7 @@ 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]+$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.ucf-[a-z]+$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");