x/cloud-init
Code Issues Proposed changes

bddeb: improve 'bddeb' to read version and add bzr revno

Browse Source 
This just removes one place where i had the version string
and additionally makes bddeb built debs have a revno in their
version
This commit is contained in:
Scott Moser 2011-12-16 12:04:04 -05:00
parent 3d6e6a3229
commit aafa6fb91a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian.trunk/changelog
View File

@ -1,5 +1,5 @@
cloud-init (0.6.2) UNRELEASED; urgency=low cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low
* build * build
-- Scott Moser <smoser@ubuntu.com> Tue, 01 Feb 2011 16:15:30 -0500 -- Scott Moser <smoser@ubuntu.com> Fri, 16 Dec 2011 11:50:25 -0500

10
tools/bddeb
View File

@ -7,11 +7,19 @@ rm -Rf "${TEMP_D}"; mkdir "${TEMP_D}"
set -e set -e
trap "rm -Rf '${TEMP_D}'" exit trap "rm -Rf '${TEMP_D}'" exit
files=$(bzr ls --versioned) files=$(bzr ls --versioned)
revno=$(bzr revno)
version=$(awk \
-F= '$1 ~ /version$/ { gsub("[^0-9.]","",$2); print $2; }' setup.py)
mkdir "${TEMP_D}/cloud-init" mkdir "${TEMP_D}/cloud-init"
tar -cf - ${files} | tar -C "${TEMP_D}/cloud-init" -xf - otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz"
tar -czf - ${files} > "$otar"
tar -C "${TEMP_D}/cloud-init" -xzf - <"$otar"
if [ ! -d "${TEMP_D}/cloud-init/debian" ]; then if [ ! -d "${TEMP_D}/cloud-init/debian" ]; then
rsync -a debian.trunk/ "${TEMP_D}/cloud-init/debian" rsync -a debian.trunk/ "${TEMP_D}/cloud-init/debian"
fi fi
sed -i -e "s,VERSION,$version," -e "s,REVNO,bzr$revno," \
"$TEMP_D/cloud-init/debian/changelog"
cd "${TEMP_D}/cloud-init" cd "${TEMP_D}/cloud-init"
debuild "$@" debuild "$@"
for x in ../*.deb; do for x in ../*.deb; do