Fixed tarball and ppa script to work with git.
Change-Id: I32835c8cdfa610911779cde8db18a9b709ce0bcc
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user