Merge pull request Normation#65 from nperron/bug_3633/dev/prevent_pos…

…tinst_to_chmod_nonexistent_files Fixes #3633 - Prevent rudder-agent postinst to chmod nonexistent files in /var/rudder/cfengine-community/ppkeys
amousset · Jun 4, 2013 · 50a8f13 · 50a8f13
2 parents ae8ff3a + a07490a
commit 50a8f13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -238,7 +238,9 @@ CFRUDDER_FIRST_INSTALL=0
 echo "Making sure that the permissions on the CFEngine key directory are correct..."
 if [ -d %{ruddervardir}/cfengine-community/ppkeys ]; then
 chmod 700 %{ruddervardir}/cfengine-community/ppkeys
-chmod 600 %{ruddervardir}/cfengine-community/ppkeys/*
+  if [ `ls %{ruddervardir}/cfengine-community/ppkeys | wc -l` -gt 0 ]; then
+    chmod 600 %{ruddervardir}/cfengine-community/ppkeys/*
+  fi
 fi
 
 # Do this at first install

diff --git a/rudder-agent/debian/postinst b/rudder-agent/debian/postinst
@@ -27,7 +27,9 @@ case "$1" in
 		echo "Making sure that the permissions on the CFEngine key directory are correct..."
     if [ -d /var/rudder/cfengine-community/ppkeys ]; then
 		chmod 700 /var/rudder/cfengine-community/ppkeys
-		chmod 600 /var/rudder/cfengine-community/ppkeys/*
+		if [ `ls /var/rudder/cfengine-community/ppkeys | wc -l` -gt 0 ]; then
+			chmod 600 /var/rudder/cfengine-community/ppkeys/*
+		fi
     fi
 
 		# Copy new binaries to workdir, make sure daemons are stopped first