summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-03-17 12:48:05 -0400
committerHolger Levsen <holger@layer-acht.org>2016-03-17 12:48:20 -0400
commit43f606f23d621b6d3e222dc7c5183b611ab10174 (patch)
tree1a7de36da3b577f31689c0ff8174788caac45750 /bin
parentad5245cec46c86dd51ed6522916c1eb2ebdef35a (diff)
downloadjenkins.debian.net-43f606f23d621b6d3e222dc7c5183b611ab10174.tar.xz
revert 24deda5a and related commits
Diffstat (limited to 'bin')
-rwxr-xr-xbin/common-functions.sh3
-rwxr-xr-xbin/setsid.py17
2 files changed, 1 insertions, 19 deletions
diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index b74f7ecf..3ce8bcb5 100755
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -43,8 +43,7 @@ if [ "${0:0:5}" != "/tmp/" ] ; then
echo "$(date -u) - start running \"$0\" (md5sum $(md5sum $0|cut -d ' ' -f1)) as \"$TTT\" on $(hostname)."
echo
# this is the "hack": call ourself as a copy in /tmp again
- # (setsid is not related to this hack. see commit log for 24deda5a8 it.)
- /srv/jenkins/bin/setsid.py $TTT "$@"
+ $TTT "$@"
exit $?
# cleanup is done automatically via trap
else
diff --git a/bin/setsid.py b/bin/setsid.py
deleted file mode 100755
index 9771c677..00000000
--- a/bin/setsid.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-"""backport of util-linux' setsid -w to Debian wheezy"""
-# replace with setsid from the util-linux package from jessie (stable) or wheezy-bpo
-
-import os
-import sys
-
-if __name__ == "__main__":
- assert len(sys.argv) > 1
- pid = os.fork()
- if pid == 0:
- os.setsid()
- os.execvp(sys.argv[1], sys.argv[1:])
- else:
- cpid, status = os.wait()
- assert cpid == pid
- sys.exit(os.WEXITSTATUS(status))