Changeset 10690 in genesis for tools

Timestamp:

May 6, 2012, 8:01:46 PM (13 years ago)

Author:

rick

Message:

Fix issues of not checking duplicates IPs.

While here, add feature that commits which mention no-genesis-check force-fully
overrides the config validators errors.

Related-To: beheer#211

Location:

tools/svn-hook

Files:

• genesis-check.sh (modified) (2 diffs)
• post-commit (added)
• pre-commit (modified) (1 diff)

tools/svn-hook/genesis-check.sh

@@ -2 +2 @@
 #
 # Check for valid genesis syntax
-# Rick van der Zwet, 2009
+#
+# Rick van der Zwet <rick@wirelessleiden.nl>
+#
 REPOS="$1"
 TXN="$2"
 
 TMPDIR=`mktemp -d -t $(basename $0 .sh)`
-
-# Clean up
-trap "rm -R $TMPDIR; exit 0" 0
-trap "rm -R $TMPDIR; exit 1" 1 2 15
 
 # External definition used for debugging
@@ -17 +15 @@
 
 # Check whether we need to check something first
-$SVNLOOK changed $REPOS | grep -q $GENESISDIR
+$SVNLOOK changed -t $TXN $REPOS | grep -q $GENESISDIR
 if [ $? -eq 1 ]; then
   exit 0
 fi
+
+# Allow us to commit stuff even if the validator fails
+$SVNLOOK log -t $TXN $REPOS | grep -q 'no-genesis-check' && exit 0
+
+# Clean up on exit
+trap "rm -R $TMPDIR" 0 1 2 3 15
 
 echo "Checking genesis config, please hold your horses..." 1>&2

tools/svn-hook/pre-commit

@@ -8 +8 @@
 export PYTHON_EGG_CACHE="/tmp/eggs"
 
-$BASEDIR/genesis-check.sh $REPOS $TXN 2>&1
+$BASEDIR/genesis-check.sh $REPOS $TXN
+
 exit $?