From 637163d4af0ec4c10327a73a83aed3fd39eecf00 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 10 Mar 2011 13:31:00 +0100
Subject: [PATCH] only md5sum if file is a regular file (not a directory)

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 conf/type/__file/explorer/md5sum |  6 +++++-
 conf/type/__file/gencode         | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/conf/type/__file/explorer/md5sum b/conf/type/__file/explorer/md5sum
index b2867385..4ac0e1b9 100755
--- a/conf/type/__file/explorer/md5sum
+++ b/conf/type/__file/explorer/md5sum
@@ -41,7 +41,11 @@ esac
 
 # No output if file does not exist - does definitely not match the md5sum :-)
 if [ -e "$destination" ]; then
-   $md5sum < "$destination"
+   if [ -f  "$destination" ]; then
+      $md5sum < "$destination"
+   else
+      echo "NO REGULAR FILE"
+   fi
 else
    echo "NO FILE FOUND, NO CHECKSUM CALCULATED."
 fi
diff --git a/conf/type/__file/gencode b/conf/type/__file/gencode
index 0f3b1bf8..43104f6f 100755
--- a/conf/type/__file/gencode
+++ b/conf/type/__file/gencode
@@ -55,16 +55,18 @@ esac
 if [ -f "$__object/parameter/source" ]; then
    source="$(cat "$__object/parameter/source")"
 
-   local_md5sum="$($md5sum < "$source")"
-   remote_md5sum="$(cat "$__object/explorer/md5sum")"
+   if [ -f "$source" ]; then
+      local_md5sum="$($md5sum < "$source")"
+      remote_md5sum="$(cat "$__object/explorer/md5sum")"
 
-   # Is md5sum the right approach?
-   if [ "$local_md5sum" != "$remote_md5sum" ]; then
-      # FIXME: This is ugly and hardcoded, replace after 1.0!
-      # Probably a better aproach is to have the user configured
-      # ~/.ssh/config to contain the right username
-      # Probably describe it in cdist-quickstart...
-      scp "$source" "root@${__target_host}:${destination}"
+      # Is md5sum the right approach?
+      if [ "$local_md5sum" != "$remote_md5sum" ]; then
+         # FIXME: This is ugly and hardcoded, replace after 1.0!
+         # Probably a better aproach is to have the user configured
+         # ~/.ssh/config to contain the right username
+         # Probably describe it in cdist-quickstart...
+         scp "$source" "root@${__target_host}:${destination}"
+      fi
    fi
 # No source? Create empty file/dir
 else