[Pcsclite-cvs-commit] r5022 - /website/matrix.py

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Jun 21 09:14:07 2010
New Revision: 5022

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5022
Log:
Correctly get the release including support for a given reader.
Also support the "SVN" release for not yet released version

Modified:
    website/matrix.py

Modified: website/matrix.py
URL: http://svn.debian.org/wsvn/pcsclite/website/matrix.py?rev=5022&op=diff
==============================================================================
--- website/matrix.py (original)
+++ website/matrix.py Mon Jun 21 09:14:07 2010
@@ -173,40 +173,41 @@
     """
     history = [
         #[ SVN revision, CCID release ]
-        [4979, "1.3.13"],
+        [273, "0.1.0"],
+        [342, "0.2.0"],
+        [423, "0.3.0"],
+        [467, "0.3.1"],
+        [552, "0.3.2"],
+        [697, "0.4.0"],
+        [703, "0.4.1"],
+        [1015, "0.9.0"],
+        [1018, "0.9.1"],
+        [1186, "0.9.2"],
+        [1400, "0.9.3"],
+        [1761, "0.9.4"],
+        [1911, "1.0.0"],
+        [2020, "1.0.1"],
+        [2135, "1.1.0"],
+        [2345, "1.2.0"],
+        [2363, "1.2.1"],
+        [2522, "1.3.0"],
+        [2692, "1.3.1"],
+        [2755, "1.3.2"],
+        [2796, "1.3.3"],
+        [2809, "1.3.4"],
+        [2842, "1.3.5"],
+        [2924, "1.3.6"],
+        [2985, "1.3.7"],
+        [3033, "1.3.8"],
+        [3208, "1.3.9"],
+        [3338, "1.3.10"],
+        [4347, "1.3.11"],
         [4931, "1.3.12"],
-        [4347, "1.3.11"],
-        [3338, "1.3.10"],
-        [3208, "1.3.9"],
-        [3033, "1.3.8"],
-        [2985, "1.3.7"],
-        [2924, "1.3.6"],
-        [2842, "1.3.5"],
-        [2809, "1.3.4"],
-        [2796, "1.3.3"],
-        [2755, "1.3.2"],
-        [2692, "1.3.1"],
-        [2522, "1.3.0"],
-        [2363, "1.2.1"],
-        [2345, "1.2.0"],
-        [2135, "1.1.0"],
-        [2020, "1.0.1"],
-        [1911, "1.0.0"],
-        [1761, "0.9.4"],
-        [1400, "0.9.3"],
-        [1186, "0.9.2"],
-        [1018, "0.9.1"],
-        [1015, "0.9.0"],
-        [703, "0.4.1"],
-        [697, "0.4.0"],
-        [552, "0.3.2"],
-        [467, "0.3.1"],
-        [423, "0.3.0"],
-        [342, "0.2.0"],
-        [273, "0.1.0"]]
+        [4979, "1.3.13"]]
     for h in history:
-        if rev >= h[0]:
+        if rev <= h[0]:
             return h[1]
+    return "SVN"
 
 
 def get_changelog():
@@ -225,6 +226,9 @@
         else:
             p.append(line)
 
+    # add the last line
+    changelog.append("".join(p).replace('\n', ''))
+
     return changelog
 
 
@@ -234,7 +238,7 @@
     """
     found = None
     for line in changelog:
-        if reader  in line:
+        if reader in line:
             found = line
 
     if found:
@@ -424,7 +428,11 @@
 
 def release2int(r):
     rr = r.split('.')
-    return int(rr[2]) + int(rr[1]) * 1000 + int(rr[0]) * 1000 * 1000
+    if len(rr) > 1:
+        return int(rr[2]) + int(rr[1]) * 1000 + int(rr[0]) * 1000 * 1000
+    else:
+        # SVN version
+        return 99*1000*1000
 
 if __name__ == "__main__":
     path = "../trunk/Drivers/ccid/readers/"