diff options
author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-25 13:07:40 -0700 |
---|---|---|
committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-25 13:07:40 -0700 |
commit | fcb055e3a58d50352e7c3f84fe42b8c71268b3b8 (patch) | |
tree | 6465f0ec9704514715784684e3446af3f29bbdd7 /packages/bddeb | |
parent | d45b0aacf88cf640dde538b3ee92958099129f74 (diff) | |
download | vyos-cloud-init-fcb055e3a58d50352e7c3f84fe42b8c71268b3b8.tar.gz vyos-cloud-init-fcb055e3a58d50352e7c3f84fe42b8c71268b3b8.zip |
Use the new version extraction tool to get the current active version.
Diffstat (limited to 'packages/bddeb')
-rwxr-xr-x | packages/bddeb | 19 |
1 files changed, 1 insertions, 18 deletions
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" |