Browse Source

generate-git-snapshot: combine dch opts

Combine DCH_OPTS and DCH_EXTRA_OPTS to DCH_COMBINED_OPTS that only one
variable need to be used as parameter.
tags/devuan/0.14.1+devuan6
Bernhard Miklautz 6 years ago
parent
commit
7e2484ac78
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      scripts/generate-git-snapshot

+ 4
- 2
scripts/generate-git-snapshot View File

@@ -99,6 +99,7 @@ dch_opts() {
DCH_OPTS="-S --multimaint-merge --ignore-branch"
echo "Using default git-dch options (${DCH_OPTS})"
fi
DCH_COMBINED_OPTS="${DCH_OPTS}"

# support overriding extra options for git-dch
if [ -n "${DCH_EXTRA_OPTS:-}" ] ; then
@@ -110,6 +111,7 @@ dch_opts() {
fi
echo "Using extra git-dch options (${DCH_EXTRA_OPTS})"
fi
DCH_COMBINED_OPTS="${DCH_COMBINED_OPTS} ${DCH_EXTRA_OPTS}"
}

# support overrides from gbp.conf
@@ -174,7 +176,7 @@ git_dch_auto() {
dch -b --distribution=UNRELEASED --newversion=$VERSION_STRING -- \
"SNAPSHOT autobuild for unreleased $ORIG_VERSION via jenkins-debian-glue."
else
git-dch --auto $DCH_OPTS $DCH_EXTRA_OPTS
git-dch --auto $DCH_COMBINED_OPTS
fi
}

@@ -199,7 +201,7 @@ identify_latest_change() {
fi

echo "Latest tag [${last_tag:-}] / merge [${last_merge:-}] seems to be $since"
git-dch -s "${since}" $DCH_OPTS $DCH_EXTRA_OPTS
git-dch -s "${since}" $DCH_COMBINED_OPTS

local NEW_VERSION=$(dpkg-parsechangelog | awk '/^Version: / {print $2}')



Loading…
Cancel
Save