Browse Source

generate-git-snapshot: make sure we're building the requested version via dpkg-source

If we are changing back to the previous branch before running dpkg-source
then we always build the latest version instead of the requested one.
So make sure to actually generate the tarballs and *then* switch back
to the original GIT_BRANCH.
merge-requests/109/head
Michael Prokop 10 years ago
parent
commit
85a8250359
  1. 7
      scripts/generate-git-snapshot

7
scripts/generate-git-snapshot

@ -210,12 +210,13 @@ else
git-buildpackage ${GBP_OPTS}
fi
# build source package, run before switching back to previous branch
# to get the actual requested version
( cd .. ; dpkg-source -I -b source )
git checkout ${GIT_BRANCH} # switch back to previous "branch" before removing the tmp branch
git branch -D "$random_branch"
# build source package
( cd .. ; dpkg-source -I -b source )
# revert to original debian/changelog to avoid merge conflicts
git checkout -- debian/changelog

Loading…
Cancel
Save