summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-20 14:05:42 +0100
committerITZKS Admin Account <itzks-admin@minobo.das-netzwerkteam.de>2011-12-20 14:05:42 +0100
commit519e9fb1f30d73e9487fc848d0465c841b1910d3 (patch)
treea0d0752b31c727c7c9a7c0f08d488c6223ca2b16 /bin
parent6ee6a308acd4209ec8f82d8515fcf75c49a2bc77 (diff)
downloadbuildscripts-519e9fb1f30d73e9487fc848d0465c841b1910d3.tar.gz
buildscripts-519e9fb1f30d73e9487fc848d0465c841b1910d3.tar.bz2
buildscripts-519e9fb1f30d73e9487fc848d0465c841b1910d3.zip
fix fetching of pristine-tar branch
Diffstat (limited to 'bin')
-rwxr-xr-xbin/itzks-build-package3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/itzks-build-package b/bin/itzks-build-package
index 1b64a53..4d6c0b0 100755
--- a/bin/itzks-build-package
+++ b/bin/itzks-build-package
@@ -127,6 +127,7 @@ prepare_workspace() {
test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
UPSTREAM_VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | sed 's,\(\.dfsg.*\),,' | cut -d"-" -f1`
ORIG_TARBALL="${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz"
+ git fetch origin pristine-tar:pristine-tar
}
# by default we build for all current debian versions
test -f BUILDS_FOR || cat > BUILDS_FOR <<EOF
@@ -149,7 +150,7 @@ build_packages() {
cd $TEMP_DIR/$PROJECT
git checkout $CHECKOUT || git checkout master
GITREV=$(itzks-gitrevno)
- test -n ${ORIG_TARBALL} && pristine-tar checkout ../${ORIG_TARBALL}
+ test -n ${ORIG_TARBALL} && git fetch origin pristine-tar:pristine-tar && pristine-tar checkout ../${ORIG_TARBALL}
# translate the version name for Debian releases
[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing