aboutsummaryrefslogtreecommitdiff
path: root/trunk/src/jail-commit
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-04-06 04:45:23 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-04-06 04:45:23 +0000
commit9abb526d0c1b359084b028161b881bd894c53877 (patch)
treebb3c5cf0c96220ad67448418b7000e1520aa6f56 /trunk/src/jail-commit
parent016b7fe6722b9853f4fb7e2aaa185907d39678de (diff)
downloadsimplepkg-9abb526d0c1b359084b028161b881bd894c53877.tar.gz
simplepkg-9abb526d0c1b359084b028161b881bd894c53877.tar.bz2
jail-commit: now using just one commit per run
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@289 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/jail-commit')
-rwxr-xr-xtrunk/src/jail-commit4
1 files changed, 3 insertions, 1 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index e09ca3e..d8cd987 100755
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -94,6 +94,7 @@ function template_svn_commit {
# usage: template_svn_commit <template-folder>
if use_svn && [ -d "$1/.svn" ]; then
+ echo Commiting changes to the repository...
cd $1
svn commit -m "changes for `date`"
if [ "$?" != "0" ]; then
@@ -129,7 +130,6 @@ function do_commit {
if [ -d "$TEMPLATE_BASE.d" ] || [ -a "$TEMPLATE_BASE.template" ]; then
templatepkg -u $template $jailpath
template_merge $jailpath
- template_svn_commit `dirname $TEMPLATE_BASE`
fi
fi
@@ -144,6 +144,7 @@ elif echo $1 | grep -q -e "^--"; then
elif [ ! -z "$1" ]; then
echo "This is jail-commit; Run \"$BASENAME --help\" for help"
do_commit $1 $2
+ template_svn_commit `dirname $TEMPLATE_BASE`
else
echo "This is jail-commit; Run \"$BASENAME --help\" for help"
if [ -f $JAIL_LIST ]; then
@@ -153,5 +154,6 @@ else
fi
# main jail
do_commit / main
+ template_svn_commit $BASE_CONF/templates
fi