From: <jbo...@li...> - 2006-06-29 10:03:28
|
Author: wrzep Date: 2006-06-29 06:03:24 -0400 (Thu, 29 Jun 2006) New Revision: 4867 Modified: labs/jbosslabs/trunk/portal-extensions/svn-hooks/blog-check.sh labs/jbosslabs/trunk/portal-extensions/svn-hooks/pre-commit labs/jbosslabs/trunk/portal-extensions/svn-hooks/xml-check.sh Log: Back to prev hook conf. Pawel Modified: labs/jbosslabs/trunk/portal-extensions/svn-hooks/blog-check.sh =================================================================== --- labs/jbosslabs/trunk/portal-extensions/svn-hooks/blog-check.sh 2006-06-29 08:48:31 UTC (rev 4866) +++ labs/jbosslabs/trunk/portal-extensions/svn-hooks/blog-check.sh 2006-06-29 10:03:24 UTC (rev 4867) @@ -20,7 +20,7 @@ if [ "$type" != "D" -a -n "`echo $token | grep ".*/members/.*/blog/.*\.\(htm\|html\)"`" ] then $SVNLOOK proplist $OPTS $REPOS $token | grep "^[[:space:]]*title$" || { - echo "The title property for a blog entry is not set. Aborting commit." >&2 + echo "The 'title' property for a blog entry is not set. Please set the 'title' property. Example: 'svn propedit title ./mySpiffyBlogPost.html'. Aborting commit." >&2 exit 1 } fi Modified: labs/jbosslabs/trunk/portal-extensions/svn-hooks/pre-commit =================================================================== --- labs/jbosslabs/trunk/portal-extensions/svn-hooks/pre-commit 2006-06-29 08:48:31 UTC (rev 4866) +++ labs/jbosslabs/trunk/portal-extensions/svn-hooks/pre-commit 2006-06-29 10:03:24 UTC (rev 4867) @@ -8,8 +8,8 @@ HOOK_PATH=/usr/svn/repo1/hooks export PATH=/usr/local/bin:/usr/bin -# $HOOK_PATH/xml-check.sh $REPOS $TXN || exit 1 -# $HOOK_PATH/blog-check.sh $REPOS $TXN || exit 1 +$HOOK_PATH/xml-check.sh $REPOS $TXN || exit 1 +$HOOK_PATH/blog-check.sh $REPOS $TXN || exit 1 # All checks passed, so allow the commit. exit 0 Modified: labs/jbosslabs/trunk/portal-extensions/svn-hooks/xml-check.sh =================================================================== --- labs/jbosslabs/trunk/portal-extensions/svn-hooks/xml-check.sh 2006-06-29 08:48:31 UTC (rev 4866) +++ labs/jbosslabs/trunk/portal-extensions/svn-hooks/xml-check.sh 2006-06-29 10:03:24 UTC (rev 4867) @@ -20,7 +20,7 @@ if [ "$type" != "D" -a -n "`echo $token | grep .*[.]xml$`" ] then $SVNLOOK cat $OPTS $REPOS $token | xmllint - >/dev/null || { - echo "Error parsing XML; aborting commit." >&2 + echo "Error parsing XML. Please make sure your xml is valid by using a tool such as 'xmllint'. Invalid XML breaks things. Aborting commit." >&2 exit 1 } fi |