diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-13 14:08:46 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-13 14:08:46 +0000 |
| commit | 0d29a7487b6e3b6e0d2431ca69248734a9d56e8a (patch) | |
| tree | a9dae6cd7f14ec16913e97605469e1daead0b32a | |
| parent | c389401d9d914b7ad34f6ef333dbcb81b5dd680c (diff) | |
| download | simplepkg-0d29a7487b6e3b6e0d2431ca69248734a9d56e8a.tar.gz simplepkg-0d29a7487b6e3b6e0d2431ca69248734a9d56e8a.tar.bz2 | |
jail-commit: bugfix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@339 04377dda-e619-0410-9926-eae83683ac58
| -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 |