[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: deal with undefined variables, thanks josch

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
35805aea by Holger Levsen at 2020-11-19T18:06:53+01:00
deal with undefined variables, thanks josch

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
cfce9a88 by Holger Levsen at 2020-11-19T18:07:18+01:00
Revert "fakeroot foreign: delay becoming strict"

This reverts commit 524e024b0f41da50a9c12a9ee351dac22d591c85.

- - - - -


2 changed files:

- bin/common-functions.sh
- bin/fakeroot_foreign_worker.sh


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -58,9 +58,10 @@ if [ "${0:0:5}" != "/tmp/" ] ; then
 	fi
 	# - for remote jobs we need to check against $SSH_ORIGINAL_COMMAND
 	# - for local jobs this would be $JOB_NAME
-	if [ -n "$JOB_NAME" ] ; then
+	if [ "${JOB_NAME+x}" = "x" ] ; then
 		WHOAREWE=$JOB_NAME
 	else
+		# $JOB_NAME is undefined
 		WHOAREWE=${SSH_ORIGINAL_COMMAND/%\ */}
 	fi
 	# abort certain jobs if we know they will fail due to certain bugs…


=====================================
bin/fakeroot_foreign_worker.sh
=====================================
@@ -1,12 +1,11 @@
 #!/bin/bash
 
+set -exu
 
 DEBUG=true
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
-set -exu
-
 REPO_URL=https://salsa.debian.org/josch/fakeroot-foreign
 
 TARGET=/srv/fakeroot-foreign



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/72502914d7a796383dbe93c56e8a7239854f9d78...cfce9a88034c5daa768035a6fe0c372bf72085d1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/72502914d7a796383dbe93c56e8a7239854f9d78...cfce9a88034c5daa768035a6fe0c372bf72085d1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20201119/fdd659ed/attachment-0001.html>