summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-11-14 14:00:48 -0800
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-11-14 14:00:48 -0800
commit3be1f230048268253889d4d365d06bcd0cbcef77 (patch)
treeffb40e32f0a45d3245549aae7c827c9dc4ec84b6
parente0b30aa70356b0d2c29ca83419a847be2918afe8 (diff)
downloadvyos-cloud-init-3be1f230048268253889d4d365d06bcd0cbcef77.tar.gz
vyos-cloud-init-3be1f230048268253889d4d365d06bcd0cbcef77.zip
Add a check on the changelog version comparing to the code version.
-rw-r--r--Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2a6be961..b659836f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,10 @@ PY_FILES+="bin/cloud-init"
YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f )
YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
+CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version)
+CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()")
-all: test
+all: test check_version
pep8:
@$(CWD)/tools/run-pep8 $(PY_FILES)
@@ -20,6 +22,12 @@ pyflakes:
test:
@nosetests $(noseopts) tests/
+check_version:
+ @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \
+ echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \
+ "not equal to code version $(CODE_VERSION)"; exit 2; \
+ else true; fi
+
2to3:
2to3 $(PY_FILES)
@@ -36,5 +44,5 @@ rpm:
deb:
./packages/bddeb
-.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml
+.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version