[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c93c13d41709bc0eb5c3ba04c17660567323cc69
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:24:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c93c13d4

gen_funcs.sh: gen_die(): Don't advertise $LOGFILE until determine_real_args() 
was called

Before determine_real_args() was called, $LOGFILE will probably contain content
from a previous run.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 0277eb2..60267a4 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -282,9 +282,14 @@ gen_die() {
                print_error 1 "ERROR: ${1}"
        fi
 
-       print_error 1 "Please consult '${LOGFILE}' for more information and any"
-       print_error 1 "errors that were reported above."
-       print_error 1 ''
+       # Don't trust $LOGFILE before determine_real_args() was called
+       if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
+       then
+               print_error 1 "Please consult '${LOGFILE}' for more information 
and any"
+               print_error 1 "errors that were reported above."
+               print_error 1 ''
+       fi
+
        print_error 1 "Report any genkernel bugs to bugs.gentoo.org and"
        print_error 1 "assign your bug to genker...@gentoo.org. Please include"
        print_error 1 "as much information as you can in your bug report; 
attaching"