diff --git a/Makefile b/Makefile index 74de4abed3fe28f26f67d85abf4994f0c621855d..7d574a95a9f16bb9d49d59514127cf29668bfd5d 100644 --- a/Makefile +++ b/Makefile @@ -36,15 +36,15 @@ dist_fallback: make -C pydist $@ check_versions: - @PYTHONPATH=. set -e; test ! -x /usr/bin/python || \ - DEFAULT=`python -c 'import debpython.version as v; print v.vrepr(v.DEFAULT)'`;\ - SUPPORTED=`python -c 'import debpython.version as v; print " ".join(sorted(v.vrepr(v.SUPPORTED)))'`;\ - DEB_DEFAULT=`sed -rn 's,^default-version = python([0.9.]*),\1,p' debian/debian_defaults`;\ + @set -e;\ + DEFAULT=`sed -rn 's,^DEFAULT = \(([0-9]+)\, ([0-9]+)\),\1.\2,p' debpython/version.py`;\ + SUPPORTED=`sed -rn 's,^SUPPORTED = \[\(([0-9]+)\, ([0-9]+)\)\, \(([0-9]+)\, ([0-9]+)\)\],\1.\2 \3.\4,p' debpython/version.py`;\ + DEB_DEFAULT=`sed -rn 's,^default-version = python([0-9.]*),\1,p' debian/debian_defaults`;\ DEB_SUPPORTED=`sed -rn 's|^supported-versions = (.*)|\1|p' debian/debian_defaults | sed 's/python//g;s/,//g'`;\ [ "$$DEFAULT" = "$$DEB_DEFAULT" ] || \ - (echo 'Please update DEFAULT in debpython/version.py' >/dev/stderr; false);\ + (echo "Please update DEFAULT in debpython/version.py ($$DEFAULT vs. $$DEB_DEFAULT)" >/dev/stderr; false);\ [ "$$SUPPORTED" = "$$DEB_SUPPORTED" ] || \ - (echo 'Please update SUPPORTED in debpython/version.py' >/dev/stderr; false) + (echo "Please update SUPPORTED in debpython/version.py ($$SUPPORTED vs. $$DEB_SUPPORTED)" >/dev/stderr; false) pdebuild: pdebuild --debbuildopts -I diff --git a/debpython/version.py b/debpython/version.py index df43a4a6b40c5b73b5ebb0eb0df7ffd225db9e0b..2324ccaa764ca6895e3850f784293f85ad469337 100644 --- a/debpython/version.py +++ b/debpython/version.py @@ -27,7 +27,7 @@ from types import GeneratorType # will be overriden via debian_defaults file few lines later SUPPORTED = [(2, 6), (2, 7)] -DEFAULT = (2, 6) +DEFAULT = (2, 7) RANGE_PATTERN = r'(-)?(\d\.\d+)(?:(-)(\d\.\d+)?)?' RANGE_RE = re.compile(RANGE_PATTERN)