Commit bb24cdbe authored by Daniel Reurich's avatar Daniel Reurich

Merge branch 'master' into 'suites/jessie'

Master

See merge request !107
parents 7eff89b0 e06ef747
jenkins-debian-glue (0.15.2+devuan4) unstable; urgency=low
* fix handling of debian/source/options
-- Daniel Reurich <centurion@zephaniah.centurion.net.nz> Thu, 07 Jan 2016 23:06:56 +1300
jenkins-debian-glue (0.15.2+devuan3) unstable; urgency=medium
* add support for setting options for newpid
......
......@@ -377,7 +377,7 @@ git_source_options() {
#Unless otherwise specified in the debian/source/options
# restrict git source archive depth and limit to only the branch we build.
if [ -z "${GIT_DEPTH:-}" ]; then
GIT_DEPTH=20
GIT_DEPTH=50
fi
local file
local value
......@@ -387,19 +387,17 @@ git_source_options() {
if [ -f ${file} ]; then
opt_depth=$(git config --file ${file} --get git-depth 2>&- || true)
opt_ref=$(git config --file ${file} --get git-ref 2>&- || true)
if [ -z "${opt_depth:-}" ]; then
echo "Using source depth of $opt_depth as defined in debian/source/options"
$GIT_DEPTH=${opt_depth}
fi
if [ -z "${opt_ref:-}" ]; then
echo "Adding git source ref: ${opt_ref}"
DBP_EXTRA_OPTS="${DBP_EXTRA_OPTS:-} --source-option=--git-ref=${opt_ref}"
fi
fi
if [ -z "${opt_depth:-}" ]; then
echo "Using source depth of $opt_depth as defined in debian/source/options"
$GIT_DEPTH=${opt_depth}
fi
echo "Setting git depth to $GIT_DEPTH"
"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
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