[28285] in Source-Commits
machtype commit: Fix bug in generate_sysnames; drop Karmic support
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jun 22 19:05:51 2014
Date: Sun, 22 Jun 2014 19:05:44 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406222305.s5MN5iZq000368@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/machtype/commit/91835005d07d94f378a8e5bcef8c9fb55ff3efa8
commit 91835005d07d94f378a8e5bcef8c9fb55ff3efa8
Author: Jonathan Reed <jdreed@mit.edu>
Date: Sun Jun 22 19:03:23 2014 -0400
Fix bug in generate_sysnames; drop Karmic support
- Check the length of the sysname list _after_ we modify it,
not before.
- Drop Karmic from the compatibility list, because that was a
barely used release and it was 4.5 years ago.
debian/changelog | 8 ++++++++
generate_sysnames.py | 11 +++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2af21e7..c173de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debathena-machtype (10.5.1) unstable; urgency=low
+
+ * Fix a bug that resulted in 33 sysnames on some platforms
+ * Drop Karmic from the compatibility list, because that was 4.5 years
+ ago
+
+ -- Jonathan Reed <jdreed@mit.edu> Sun, 22 Jun 2014 19:03:19 -0400
+
debathena-machtype (10.5) unstable; urgency=low
* Move logic for generating sysnames from debian/rules to
diff --git a/generate_sysnames.py b/generate_sysnames.py
index 1fd9eef..a41ece3 100755
--- a/generate_sysnames.py
+++ b/generate_sysnames.py
@@ -108,11 +108,10 @@ distros = [Ubuntu('14.04'),
Ubuntu('13.10'), Ubuntu('13.04'),
Debian('7.0', arches=DEFAULT_ARCHES + ('armel',)),
Ubuntu('12.10'), Ubuntu('12.04'),
- Ubuntu('11.10'),
Debian('6.0'),
- Ubuntu('11.04'),
+ Ubuntu('11.10'), Ubuntu('11.04'),
Ubuntu('10.10'), Ubuntu('10.04'),
- Ubuntu('9.10'), Ubuntu('9.04'),
+ Ubuntu('9.04'),
Debian('4.0.4', sysver='5.0'),
Ubuntu('8.04'),
Debian('4.0')]
@@ -132,15 +131,15 @@ if len(sysnames) < len(archlist(ARCH)):
fail("Insufficient number of sysnames, cannot proceed.",
"sysnames: {0}".format(sysnames))
-if len(sysnames) > MAX_SYSNAMES:
- fail("Sysname list too long")
-
sysname = sysnames.pop(0)
sysnames += ['i386_rhel4']
if not compare_versions(DEBIAN_VERSION, 'ge', '7.0'):
sysnames += ['i386_rhel3', 'i386_linux24']
+if len(sysnames) + 1 > MAX_SYSNAMES:
+ fail("Sysname list too long")
+
if IS_UBUNTU and (Ubuntu(UBUNTU_VERSION).sysnames()[0] != sysname):
fail("Sysname mismatch -- is this a new release?",
"{0} != {1}".format(Ubuntu(UBUNTU_VERSION).sysnames()[0], sysname))
