aboutsummaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-03 03:55:53 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-03 03:55:53 +0000
commit8b881f809ba17e9c4a148cbabb23d70d5bd16ece (patch)
tree4a8ba9867758146c99d263d0b3f4f2567df1b268 /trunk
parentee47c515fa49ff0eda5fe1ce107af145e9738de3 (diff)
downloadsimplepkg-8b881f809ba17e9c4a148cbabb23d70d5bd16ece.tar.gz
simplepkg-8b881f809ba17e9c4a148cbabb23d70d5bd16ece.tar.bz2
minor fix at jail-commit
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@632 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
-rwxr-xr-xtrunk/src/jail-commit4
1 files changed, 2 insertions, 2 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index f1a1c9c..278d766 100755
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -87,8 +87,8 @@ function template_merge {
cat $TEMPLATE_BASE.perms.tmp | sed '/^$/d' > $TEMPLATE_BASE.perms
rm -f $TEMPLATE_BASE.perms.tmp
- if ! svn_check $TEMPLATE_BASE,perms; then
- svn add $TEMPLATE_BASE,perms
+ if templates_under_svn && ! svn_check $TEMPLATE_BASE.perms; then
+ svn add $TEMPLATE_BASE.perms
fi
}