[debian-edu-commits] debian-edu/ 01/02: debian/educlient.postinst: Skip .placeholder files when diverting config files.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository educlient.

commit 530c3229c3dacc970be0ab57bce807a0244850e1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 12 14:10:36 2015 +0100

    debian/educlient.postinst: Skip .placeholder files when diverting config files.
---
 debian/educlient.postinst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/educlient.postinst b/debian/educlient.postinst
index 47704ad..7927f20 100755
--- a/debian/educlient.postinst
+++ b/debian/educlient.postinst
@@ -72,6 +72,11 @@ for working_dir in ${ETC_DISTRIB_VERSION} ${ETC_DISTRIB_COMMON}  ${ETC_COMMON};
 	for i in $COPY_DIVERT_FILES
 		do
 
+			# skip .placeholder files
+			if echo "$COPY_DIVERT_FILES" | grep -qE ".*/\.placeholder\$"; then
+				continue
+			fi
+
 			# already processed this file, than skip
 			if grep -q "/etc/$i" /etc/debian-edu/educlient.files-*; then
 				continue

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/educlient.git