PR#315: suppress 'nothing added to commit..' messages from countme-update.sh - fedora-infra/ansible

fedora-infra / ansible

#315 suppress 'nothing added to commit..' messages from countme-update.sh

Merged 3 years ago by smooge. Opened 3 years ago by wwoods.

fedora-infra/ wwoods/ansible master into master

suppress 'nothing added to commit..' messages from countme-update.sh

Will Woods • 3 years ago

9a4201e

roles/web-data-analysis/files/countme-update.sh

file modified

+8 -4

		`@@ -15,6 +15,9 @@`
		`UPDATE_RAWDB=countme-update-rawdb.sh`
		`UPDATE_TOTALS=countme-update-totals.sh`

		`+ # How we're gonna call git - our local repo dir is LOCAL_DATA_DIR`
		`+ _GIT="git -C $LOCAL_DATA_DIR"`
		`+`
		`# Copy with atomic overwrite`
		`atomic_copy() {`
		`local src="$1" dst="$2"`
		`@@ -94,12 +97,13 @@`
		`_run $UPDATE_RAWDB --rawdb $RAW_DB`
		`_run $UPDATE_TOTALS --rawdb $RAW_DB --totals-db $TOTALS_DB --totals-csv $TOTALS_CSV`

		`- # Update local git repo`
		`+ # If needed: init local git repo and mark file(s) to be tracked therein`
		`if [ ! -d $LOCAL_DATA_DIR/.git ]; then`
		`- _run git init $LOCAL_DATA_DIR`
		`- _run git -C $LOCAL_DATA_DIR add -N $(realpath $TOTALS_CSV --relative-to $LOCAL_DATA_DIR)`
		`+ _run $_GIT init`
		`+ _run $_GIT add -N $(realpath $TOTALS_CSV --relative-to $LOCAL_DATA_DIR)`
		`fi`
		`- _run git -C $LOCAL_DATA_DIR commit -a -m "$(date -u +%F) update"`
		`+ # If any tracked files were updated, commit changes`
		`+ _run $_GIT diff --quiet \|\| _run $_GIT commit -a -m "$(date -u +%F) update"`

		`# Copy new data into place`
		`_run atomic_copy $TOTALS_DB $PUBLIC_TOTALS_DB`

wwoods commented 3 years ago

Right now countme-update.sh tries to git commit -a whether or not
anything has changed, which results in this output whenever there's no
new changes to commit:

On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        raw.db
        totals.db

nothing added to commit but untracked files present (use "git add" to track)

This commit tweaks countme-update.sh so that it only attempts git commit
if there are changes to be committed - i.e. when git diff returns 1.

Signed-off-by: Will Woods wwoods@redhat.com