From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Wed, 27 Apr 2016 07:58:42 +0000 (+0200)
Subject: path-util: Add hidden suffixes for ucf (#3131)
X-Git-Tag: v230~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=739d638a6e4f214217f60708911db6028a87a48c;p=thirdparty%2Fsystemd.git

path-util: Add hidden suffixes for ucf (#3131)

ucf is a standard Debian helper for managing configuration file upgrades which
need more interaction or elaborate merging than conffiles managed by dpkg.
Ignore its temporary and backup files similarly to the *.dpkg-* ones to avoid
creating units for them in generators.

https://bugs.debian.org/775903
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 044a12889dd..25aa355397a 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -774,6 +774,9 @@ bool hidden_file_allow_backup(const char *filename) {
                 endswith(filename, ".dpkg-bak") ||
                 endswith(filename, ".dpkg-backup") ||
                 endswith(filename, ".dpkg-remove") ||
+                endswith(filename, ".ucf-new") ||
+                endswith(filename, ".ucf-old") ||
+                endswith(filename, ".ucf-dist") ||
                 endswith(filename, ".swp");
 }