- fixed correct python checking, bz1715479 - fix unbound variables, issues #43 - fixed path to services state store - fixed file submit to local patch is called outside test harness - restore shell options in rlWatchdog, bz1713291 - correctly skip test version if there's no rpm source of it, bz1712495
33 lines
984 B
Diff
33 lines
984 B
Diff
From 1ee8383ff6108273a0bd726e8ccddbdaa43956b9 Mon Sep 17 00:00:00 2001
|
|
From: Dalibor Pospisil <dapospis@redhat.com>
|
|
Date: Mon, 3 Jun 2019 16:39:42 +0200
|
|
Subject: [PATCH 7/8] fix unbound variables
|
|
|
|
---
|
|
src/beakerlib.sh | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/beakerlib.sh b/src/beakerlib.sh
|
|
index c123e3d..2c27c10 100644
|
|
--- a/src/beakerlib.sh
|
|
+++ b/src/beakerlib.sh
|
|
@@ -31,6 +31,7 @@
|
|
# Boston, MA 02110-1301, USA.
|
|
#
|
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
+__INTERNAL_SOURCED=${__INTERNAL_SOURCED:-""}
|
|
echo "${__INTERNAL_SOURCED}" | grep -qF -- " ${BASH_SOURCE} " && return || __INTERNAL_SOURCED+=" ${BASH_SOURCE} "
|
|
|
|
: <<'=cut'
|
|
@@ -410,6 +411,7 @@ export __INTERNAL_PERSISTENT_TMP=/var/tmp
|
|
test -f /etc/profile.d/cobbler.sh && . /etc/profile.d/cobbler.sh
|
|
|
|
set -e
|
|
+BEAKERLIB_DIR=${BEAKERLIB_DIR:=""}
|
|
export BEAKERLIB=${BEAKERLIB:-"/usr/share/beakerlib"}
|
|
. $BEAKERLIB/storage.sh
|
|
. $BEAKERLIB/infrastructure.sh
|
|
--
|
|
2.21.0
|
|
|