[Secure-testing-commits] r43772 - bin

[Chris Lamb]

Author: lamby
Date: 2016-08-04 17:49:15 +0000 (Thu, 04 Aug 2016)
New Revision: 43772

Modified:
   bin/lts-missing-uploads.py
Log:
lts-missing-uploads: Don't blow up on invalid version numbers in DLAs

Modified: bin/lts-missing-uploads.py
===================================================================
--- bin/lts-missing-uploads.py	2016-08-04 17:49:14 UTC (rev 43771)
+++ bin/lts-missing-uploads.py	2016-08-04 17:49:15 UTC (rev 43772)
@@ -71,17 +71,30 @@
         sources = self.get_sources()
 
         for source, dla in sorted(dlas.items()):
-            version = sources[source]
-
-            if Version(dla['version']) > Version(version):
-                self.warn("{}: DLA-{} announced version {} but LTS has {} <{}>".format(
+            try:
+                dla_version = Version(dla['version'])
+            except ValueError:
+                self.warn("{}: DLA-{} announced with invalid version: {} <{}>",
                     source,
                     dla['dla'],
                     dla['version'],
-                    version,
                     dla['url'],
-                ))
+                )
+                continue
 
+            archive_version = Version(sources[source])
+
+            if dla_version <= archive_version:
+                continue
+
+            self.warn("{}: DLA-{} announced version {} but LTS has {} <{}>",
+                source,
+                dla['dla'],
+                dla_version,
+                archive_version,
+                dla['url'],
+            )
+
         return 0
 
     def get_dlas(self, year, month):