sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source
This commit is contained in:
John Wiegley 2009-11-01 16:25:20 -05:00
commit a048afc8a3
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
.timestamp
*.backup *.backup
*.elc *.elc
*.pyc *.pyc

4
src/xact.cc
View file

@ -457,10 +457,6 @@ bool xact_t::valid() const
DEBUG("ledger.validate", "xact_t: ! _date"); DEBUG("ledger.validate", "xact_t: ! _date");
return false; return false;
} }
if (! has_flags(ITEM_GENERATED | ITEM_TEMP) && ! journal) {
DEBUG("ledger.validate", "xact_t: ! journal");
return false;
}
foreach (post_t * post, posts) foreach (post_t * post, posts)
if (post->xact != this || ! post->valid()) { if (post->xact != this || ! post->valid()) {

15
tools/proof
View file

@ -1,13 +1,23 @@
#!/bin/sh #!/bin/bash
set -e set -e
cd ~/src/ledger
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* rm -fr ~/Products/ledger*
./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log ./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log
if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then
if [ "$1" = "--alert" ]; then if [[ "$1" = "--alert" ]]; then
notify "Ledger proof build FAILED" notify "Ledger proof build FAILED"
else else
echo "Ledger proof build FAILED" echo "Ledger proof build FAILED"
@ -15,6 +25,7 @@ if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then
fi fi
else else
echo "Ledger proof build succeeded" echo "Ledger proof build succeeded"
echo $VERSION > ~/Products/last-proofed
fi fi
exit 0 exit 0