Commit 7e66c278 authored by Franco Lanza's avatar Franco Lanza

Merge branch 'master' into 'suites/jessie'

Master

See merge request !98
parents 3b0b20b1 3818dd4f
jenkins-debian-glue (0.15.2+devuan3) unstable; urgency=medium
* add support for setting options for newpid
* fix error with debian/source/options with gitsrc
-- Franco (nextime) Lanza <nextime@devuan.org> Mon, 04 Jan 2016 06:54 +0100
jenkins-debian-glue (0.15.2+devuan2) unstable; urgency=medium
* Fix typo in dependencies for git-buildpackage
......@@ -627,4 +634,4 @@ jenkins-debian-glue (0.1.0) unstable; urgency=low
* Initial release.
-- Michael Prokop <mika@grml.org> Wed, 25 Jul 2012 17:32:53 +0200
-- Michael Prokop <mika@grml.org> Wed, 25 Jul 2012 17:32:53 +0200
\ No newline at end of file
......@@ -38,16 +38,23 @@ if ! apt-cache policy newpid | grep -q 'newpid:' ; then
echo "The newpid package doesn't seem to be available, not considering for installation"
else
echo "The newpid package seems to be available, considering for installation"
if [ ${NEWPID_SUPPRESS:-} != True ]; then
newpid_name='newpid'
else
echo "Config Suppressed use of newpid!"
newpid_name='newpid'
fi
# runner/adt-run uses apt-utils's apt-ftparchive and
# pbuilder's pbuilder-satisfydepends-classic
apt-get install -y autopkgtest apt-utils pbuilder $newpid_name
case ${NEWPID_OPTS:-} in
--suppress|--false)
echo "Suppressing use of newpid!"
$newpid_name=""
;;
*)
newpid_name="$newpid_name $NEWPID_OPTS"
;;
esac
# since autopkgtest 3.16 the --tmp-dir option is gone, make sure
# we've --output-dir available though before using it
if adt-run --help | grep -q -- --output-dir 2>/dev/null ; then
......
......@@ -389,18 +389,17 @@ git_source_options() {
opt_ref=$(git config --file ${file} --get git-ref 2>&- || true)
fi
if [ -z "${opt_depth:-}" ]; then
echo "Setting git source depth to $GIT_DEPTH"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-depth=$GIT_DEPTH"
else
echo "Using source depth of $opt_depth as defined in debian/source/options"
$GIT_DEPTH=${opt_depth}
fi
if ![ -z "${opt_ref:-}" ]; then
echo "Setting git source ref to $GIT_REF"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-ref=${BRANCH}"
echo "Setting git depth to $GIT_DEPTH"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-depth=$GIT_DEPTH"
if [ -z "${opt_ref:-}" ]; then
echo "Adding git source ref: ${opt_ref}"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-ref=${opt_ref}"
else
echo "Settin git source ref to $opt_ref as defined in debian/source/options"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-ref=${BRANCH}"
fi
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment