This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master
in repository fedora-budget.
from d717621 Reconcile bex charges and add Council FAD
new 319ef01 Fix NA, LATAM, APAC overall budget printing
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
FY18/gen_reports | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
Show replies by date
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit 319ef01ba1a9dc5685381dfbcde0cfa537a67c36
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Tue Apr 18 17:18:09 2017 +0200
Fix NA, LATAM, APAC overall budget printing
This was printing all sub-categories not just the Q rollups
---
FY18/gen_reports | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports
index eaf9ac7..181a6fb 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -34,9 +34,9 @@ if [ ! -s mindshare.csv ]; then
fi
# APAC
-ledger -f ledger/fedora.ledger budget '^APAC' and not '^APAC$' --flat |
../_builder/budget2tsv > apac.csv
+ledger -f ledger/fedora.ledger budget '^APAC' and not '^APAC$' --flat
--depth 2 | ../_builder/budget2tsv > apac.csv
if [ ! -s apac.csv ]; then
- ledger -f ledger/fedora.ledger budget '^APAC' --flat | ../_builder/budget2tsv
> apac.csv
+ ledger -f ledger/fedora.ledger budget '^APAC' --flat --depth 2 |
../_builder/budget2tsv > apac.csv
fi
ledger -f ledger/fedora.ledger budget '^APAC:Q1$' | ../_builder/budget2tsv | cut
-f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > apac-q1.csv
ledger -f ledger/fedora.ledger budget '^APAC:Q1' --flat | tail -n +2 |
../_builder/budget2tsv >> apac-q1.csv
@@ -62,9 +62,9 @@ ledger -f ledger/fedora.ledger budget '^EMEA:Q4$' |
../_builder/budget2tsv | cu
ledger -f ledger/fedora.ledger budget '^EMEA:Q4' --flat | tail -n +2 |
../_builder/budget2tsv >> emea-q4.csv
# LATAM
-ledger -f ledger/fedora.ledger budget '^LATAM' and not '^LATAM$' --flat |
../_builder/budget2tsv > latam.csv
+ledger -f ledger/fedora.ledger budget '^LATAM' and not '^LATAM$' --flat
--depth 2 | ../_builder/budget2tsv > latam.csv
if [ ! -s latam.csv ]; then
- ledger -f ledger/fedora.ledger budget '^LATAM' --flat |
../_builder/budget2tsv > latam.csv
+ ledger -f ledger/fedora.ledger budget '^LATAM' --flat --depth 2 |
../_builder/budget2tsv > latam.csv
fi
ledger -f ledger/fedora.ledger budget '^LATAM:Q1$' | ../_builder/budget2tsv |
cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > latam-q1.csv
ledger -f ledger/fedora.ledger budget '^LATAM:Q1' --flat | tail -n +2 |
../_builder/budget2tsv >> latam-q1.csv
@@ -76,9 +76,9 @@ ledger -f ledger/fedora.ledger budget '^LATAM:Q4$' |
../_builder/budget2tsv | c
ledger -f ledger/fedora.ledger budget '^LATAM:Q4' --flat | tail -n +2 |
../_builder/budget2tsv >> latam-q4.csv
# NA
-ledger -f ledger/fedora.ledger budget '^NA' and not '^NA$' --flat |
../_builder/budget2tsv > na.csv
+ledger -f ledger/fedora.ledger budget '^NA' and not '^NA$' --flat --depth
2 | ../_builder/budget2tsv > na.csv
if [ ! -s na.csv ]; then
- ledger -f ledger/fedora.ledger budget '^NA' --flat | ../_builder/budget2tsv
> na.csv
+ ledger -f ledger/fedora.ledger budget '^NA' --flat --depth 2 |
../_builder/budget2tsv > na.csv
fi
ledger -f ledger/fedora.ledger budget '^NA:Q1$' | ../_builder/budget2tsv | cut
-f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > na-q1.csv
ledger -f ledger/fedora.ledger budget '^NA:Q1' --flat | tail -n +2 |
../_builder/budget2tsv >> na-q1.csv
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.