From a159ba3e9c75a374fe96e71f5da4e71bcda245e2 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Apr 18 2017 11:50:27 +0000 Subject: [builder] really dump the command arguments --- diff --git a/builder/copr-builder b/builder/copr-builder index 060a4de..5754821 100755 --- a/builder/copr-builder +++ b/builder/copr-builder @@ -227,9 +227,6 @@ flock -n 9 || die "can't lock $opt_lockfile" # Ensure there are no leftovers. trap destruct EXIT -quote_args copr-builder "${oldargs[@]}" -info "running command: $quote_args_result" - # Make the "re-attaching" in copr-backend Worker convenient. That's to be done # by 'tail --retry -f --pid=`cat pidfile`'. echo $$ > "$opt_pidfile" @@ -237,6 +234,9 @@ echo $$ > "$opt_pidfile" # Duplicate all output to the log file. exec &> >(tee -i "$opt_log_file") +quote_args copr-builder "${oldargs[@]}" +info "running command: $quote_args_result" + opt_parse_error () { error "$*" diff --git a/builder/copr-builder.spec b/builder/copr-builder.spec index 5534d74..12b1f25 100644 --- a/builder/copr-builder.spec +++ b/builder/copr-builder.spec @@ -2,7 +2,7 @@ Name: copr-builder Version: 0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Build package from copr dist-git License: GPLv2+ @@ -66,7 +66,7 @@ install -p -m 644 %SOURCE7 %buildroot%confdir %changelog -* Tue Apr 18 2017 Pavel Raiskup - 0-11 +* Tue Apr 18 2017 Pavel Raiskup - 0-12 - dump command-line arguments to log (easier reproducibility) * Thu Apr 13 2017 Pavel Raiskup - 0-10