From fcb055e3a58d50352e7c3f84fe42b8c71268b3b8 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 25 Jun 2012 13:07:40 -0700
Subject: Use the new version extraction tool to get the current active
 version.

---
 packages/bddeb | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'packages')

diff --git a/packages/bddeb b/packages/bddeb
index 74932985..2a089295 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -23,24 +23,7 @@ trap "rm -Rf '${TEMP_D}'" EXIT SIGINT SIGTERM
 cd $ROOT
 files=$(bzr ls --versioned)
 revno=$(bzr revno)
-version=$(awk -F: \
-   '$1 ~ /[0-9][.][0-9]+[.][0-9]+/ { print $1 ; exit(0); }' ChangeLog )
-
-# Ensure that the version found in 'Changelog' is the same in the python 
-# cloud-init version directory
-py_version=$(python -c 'from cloudinit import version; import sys; \
-sys.stdout.write(version.version_string())')
-
-# Canonicalize the changelog version
-ch_version=$(python -c "from distutils import version; import sys; \
-sys.stdout.write(str(version.StrictVersion('$version')));")
-
-if [ "$py_version" != "$ch_version" ]; then
-    echo "Cloud-init python version $py_version" \
-         " != changelog version $ch_version"
-    echo "Please ensure they are the same!"
-    exit 1
-fi
+version=$(tools/read-version)
 
 mkdir "${TEMP_D}/cloud-init"
 otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz"
-- 
cgit v1.2.3