Fixed tarball and ppa script to work with git.

Change-Id: I32835c8cdfa610911779cde8db18a9b709ce0bcc
This commit is contained in:
Monty Taylor
2011-08-04 08:26:29 -07:00
parent ac9fef7bf9
commit 7b77779eca
2 changed files with 14 additions and 3 deletions

View File

@@ -46,8 +46,14 @@ ln -s "${tarball}" "${PROJECT}_${version}.orig.tar.gz"
echo bzr checkout -r ${PACKAGING_REVNO} --lightweight $BZR_BRANCH $PROJECT-*
bzr checkout -r ${PACKAGING_REVNO} --lightweight $BZR_BRANCH $PROJECT-*
cd $PROJECT-*
PACKAGING_REVNO="$(bzr revno --tree)"
rm -rf .bzr
if [ -d .git ]
then
PACKAGING_REVNO="$(git log --oneline | wc -l)"
rm -rf .git
else
PACKAGING_REVNO="$(bzr revno --tree)"
rm -rf .bzr
fi
# Please don't change this. It's the only way I'll get notified
# if an upload fails.

View File

@@ -47,7 +47,12 @@ find_next_version() {
then
version="${version}~"
fi
revno="${revno:-$(bzr revno)}"
if [ -d .git ]
then
revno="${revno:-$(git log --oneline | wc -l)}"
else
revno="${revno:-$(bzr revno)}"
fi
version="$(printf %s%s.%s%d "$version" "$datestamp" "$REVNOPREFIX" "$revno")"
if grep -q "^$PROJECT $version$" "$RECORDFILE"
then