From dc2c2c98d41609d5b18f57b97e74ea48e62f8508 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Nov 2009 06:45:02 -0500 Subject: Added .timestamp to Git ignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ac30caf2..e622c64c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.timestamp *.backup *.elc *.pyc -- cgit v1.2.3 From 5ef50f88779c9fb02e8c762bea9c7622464153b8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Nov 2009 06:48:49 -0500 Subject: Removed excessive validity check from xact_t::valid --- src/xact.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/xact.cc b/src/xact.cc index 34b8c340..3670cb94 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -457,10 +457,6 @@ bool xact_t::valid() const DEBUG("ledger.validate", "xact_t: ! _date"); return false; } - if (! has_flags(ITEM_GENERATED | ITEM_TEMP) && ! journal) { - DEBUG("ledger.validate", "xact_t: ! journal"); - return false; - } foreach (post_t * post, posts) if (post->xact != this || ! post->valid()) { -- cgit v1.2.3 From 29c43c8d552ced06a49cbe3cdf319cc6ea827a84 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Nov 2009 06:52:54 -0500 Subject: Further refinements to tools/proof --- tools/proof | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/proof b/tools/proof index 7acc92fd..0509c57e 100755 --- a/tools/proof +++ b/tools/proof @@ -1,13 +1,21 @@ -#!/bin/sh +#!/bin/bash set -e +VERSION=$(git describe --all --long) + +if [[ -f ~/Products/last-proofed && \ + $(< ~/Products/last-proofed) = $VERSION ]]; then + echo "No need to run tools/proof again" + exit 0 +fi + rm -fr ~/Products/ledger* ./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then - if [ "$1" = "--alert" ]; then + if [[ "$1" = "--alert" ]]; then notify "Ledger proof build FAILED" else echo "Ledger proof build FAILED" @@ -15,6 +23,7 @@ if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then fi else echo "Ledger proof build succeeded" + echo $VERSION > ~/Products/last-proofed fi exit 0 -- cgit v1.2.3 From 4fcbef3b0cec9c1a55395c76bd03017167453cc5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Nov 2009 16:25:15 -0500 Subject: In tools/proof, change into source directory --- tools/proof | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/proof b/tools/proof index 0509c57e..ede22558 100755 --- a/tools/proof +++ b/tools/proof @@ -2,6 +2,8 @@ set -e +cd ~/src/ledger + VERSION=$(git describe --all --long) if [[ -f ~/Products/last-proofed && \ -- cgit v1.2.3