diff options
-rw-r--r-- | trunk/doc/CHANGELOG | 5 | ||||
-rwxr-xr-x | trunk/src/jail-commit | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 2fc3d35..cfaa5d2 100644 --- 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 b801d12..f2695d7 100755 --- 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 |