91 lines
2.2 KiB
Diff
91 lines
2.2 KiB
Diff
|
From d9c93a6dea182b76ecf27e2db70bfe4da944e7f5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Schmitt <scdbackup@gmx.net>
|
||
|
|
Date: Tue, 8 Aug 2017 09:52:39 +0200
|
||
|
|
Subject: [PATCH] Bug fix: ./run_all_auto aborted on kojipkgs.fedoraproject.org on tput attempt. Thanks Robert Scheck.
|
||
|
|
|
||
|
|
---
|
||
|
|
releng/inc/releng_getopts.inc | 10 ++++++++--
|
||
|
|
releng/run_all_auto | 24 ++++++++++++++++++++----
|
||
|
|
2 files changed, 28 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/releng/inc/releng_getopts.inc b/releng/inc/releng_getopts.inc
|
||
|
|
index ecae07d..3d1db4b 100644
|
||
|
|
--- a/releng/inc/releng_getopts.inc
|
||
|
|
+++ b/releng/inc/releng_getopts.inc
|
||
|
|
@@ -43,12 +43,18 @@ EOF
|
||
|
|
|
||
|
|
#############################################
|
||
|
|
boldify() {
|
||
|
|
- if which tput >/dev/null 2>&1; then tput smso; fi
|
||
|
|
+ if which tput >/dev/null 2>&1
|
||
|
|
+ then
|
||
|
|
+ tput smso || dummy_variable=1
|
||
|
|
+ fi
|
||
|
|
}
|
||
|
|
|
||
|
|
#############################################
|
||
|
|
unboldify() {
|
||
|
|
- if which tput >/dev/null 2>&1; then tput rmso; fi
|
||
|
|
+ if which tput >/dev/null 2>&1
|
||
|
|
+ then
|
||
|
|
+ tput rmso || dummy_variable=1
|
||
|
|
+ fi
|
||
|
|
}
|
||
|
|
|
||
|
|
#############################################
|
||
|
|
diff --git a/releng/run_all_auto b/releng/run_all_auto
|
||
|
|
index 1ba8f77..15c8218 100755
|
||
|
|
--- a/releng/run_all_auto
|
||
|
|
+++ b/releng/run_all_auto
|
||
|
|
@@ -59,6 +59,22 @@ count_lines()
|
||
|
|
}
|
||
|
|
|
||
|
|
#############################################
|
||
|
|
+# copied from releng/inc/releng_getopts.inc which is not included here.
|
||
|
|
+boldify() {
|
||
|
|
+ if which tput >/dev/null 2>&1
|
||
|
|
+ then
|
||
|
|
+ tput smso || dummy_variable=1
|
||
|
|
+ fi
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+unboldify() {
|
||
|
|
+ if which tput >/dev/null 2>&1
|
||
|
|
+ then
|
||
|
|
+ tput rmso || dummy_variable=1
|
||
|
|
+ fi
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+#############################################
|
||
|
|
print_usage()
|
||
|
|
{
|
||
|
|
cat << HLP
|
||
|
|
@@ -162,9 +178,9 @@ fi
|
||
|
|
*)
|
||
|
|
exit_value=2
|
||
|
|
printf "done in ${TS} sec. "
|
||
|
|
- which tput >/dev/null 2>&1 && tput smso
|
||
|
|
+ boldify
|
||
|
|
printf "FAIL -> EXIT CODE $RET"
|
||
|
|
- which tput >/dev/null 2>&1 && tput rmso
|
||
|
|
+ unboldify
|
||
|
|
echo
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
@@ -236,10 +252,10 @@ fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
#
|
||
|
|
- which tput >/dev/null 2>&1 && tput smso
|
||
|
|
+ boldify
|
||
|
|
echo # | tee -a ${CLOG}
|
||
|
|
echo "${SELF}: Leaving the following cruft in ${GEN_DATA_DIR}:" # | tee -a ${CLOG}
|
||
|
|
- which tput >/dev/null 2>&1 && tput rmso
|
||
|
|
+ unboldify
|
||
|
|
ls -lth "${GEN_DATA_DIR}" # | tee -a ${CLOG}
|
||
|
|
|
||
|
|
# Fin
|
||
|
|
--
|
||
|
|
libgit2 0.25.0
|
||
|
|
|