[28544] in Source-Commits
machtype commit: Fix jessie build
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Sat Nov 28 16:36:01 2015
Date: Sat, 28 Nov 2015 16:35:59 -0500
From: Victor Vasiliev <vasilvv@mit.edu>
Message-Id: <201511282135.tASLZxoG004511@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/machtype/commit/d96f991a7ead98173e1027f1bdbd782f0f337965
commit d96f991a7ead98173e1027f1bdbd782f0f337965
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Sat Nov 28 16:28:41 2015 -0500
Fix jessie build
Currently, jessie base has version 8+deb8u2, which breaks the build
script.
debian/changelog | 6 ++++++
generate_sysnames.py | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 343377d..ed565b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-machtype (10.5.9) unstable; urgency=medium
+
+ * Fix build support for Jessie.
+
+ -- Victor Vasiliev <vasilvv@mit.edu> Sat, 28 Nov 2015 15:41:25 -0500
+
debathena-machtype (10.5.8) unstable; urgency=medium
* Support Wily.
diff --git a/generate_sysnames.py b/generate_sysnames.py
index 9047012..d470b4b 100755
--- a/generate_sysnames.py
+++ b/generate_sysnames.py
@@ -52,6 +52,8 @@ ARCH = os.getenv('OVERRIDE_MACHTYPE_ARCH',
MAX_SYSNAMES = 32
+if '+' in DEBIAN_VERSION:
+ DEBIAN_VERSION = DEBIAN_VERSION.split('+', 1)[0]
if DEBIAN_VERSION.isdigit():
DEBIAN_VERSION += ".0"
