jail-commit: bugfix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@339 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 2fc3d35574ccf869dc06131cea4520f4b2d10de4..cfaa5d2b9cb0f54be19d6bc3a5b622cce7309771 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -4,10 +4,7 @@ simplepkg changelog
 0.5pre17
 ========
 
-  - createpkg
-    - bugfix
-
-  - lspkg:
+  - createpkg, lspkg, jail-commit:
     - bugfixes
 
 0.5pre16

diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index b801d120607ae4fc68499ab9a06bbced71435858..f2695d79016f044b254f28ccf77f5e4a663029fc 100755 (executable)
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -54,12 +54,12 @@ function template_merge {
 
     if [[ -e "$file" && -e "$1/$file" ]]; then
 
-      if [ ! -d "$file" ] && [ ! -s "$file" ]; then
+      if [ ! -d "$file" ] && [ ! -h "$file" ]; then
         if ! diff $file $1/$file; then
           echo Updating $file
           cp -af $1/$file $file
         fi
-      elif [ -s "$file" ]; then
+      elif [ -h "$file" ]; then
         if [ "`readlink $file`" != "`readlink $1/$file`" ]; then
           rm -f $file
           ln -s `readlink $1/$file` $file