Merge branch 'next'
This commit is contained in:
commit
a048afc8a3
3 changed files with 14 additions and 6 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
.timestamp
|
||||
*.backup
|
||||
*.elc
|
||||
*.pyc
|
||||
|
|
|
|||
|
|
@ -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()) {
|
||||
|
|
|
|||
15
tools/proof
15
tools/proof
|
|
@ -1,13 +1,23 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
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*
|
||||
|
||||
./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 +25,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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue