library-web r430 - in trunk: . src

[fpeters svn gnome org]

Author: fpeters
Date: Tue Apr 29 09:27:42 2008
New Revision: 430
URL: http://svn.gnome.org/viewvc/library-web?rev=430&view=rev

Log:
* src/lgo.py: don't use module version number as path in indexes for
modules that are older versions but processed later, because they
are mentioned in extra-tarballs.  (closes: #530517)



Modified:
   trunk/ChangeLog
   trunk/src/lgo.py

Modified: trunk/src/lgo.py
==============================================================================
--- trunk/src/lgo.py	(original)
+++ trunk/src/lgo.py	Tue Apr 29 09:27:42 2008
@@ -423,11 +423,18 @@
             if doc._last_version == self.version:
                 # file was already processed in a previous moduleset
                 return None
-            doc._last_version = self.version
-            if int(self.one_dot_version.split('.')[1]) % 2 == 0:
-                # update path to point to the latest version (but no
-                # development versions)
-                doc.path = self.path
+
+            # a more recent version may already have been installed; probably
+            # because the same module is being mentioned as an extra tarball
+            # with an inferior version number; don't update path in this
+            # situation.  (see bug #530517 for the mention of this problem)
+            if version_cmp(doc._last_version, self.version) <= 0:
+                doc._last_version = self.version
+                if int(self.one_dot_version.split('.')[1]) % 2 == 0:
+                    # update path to point to the latest version (but no
+                    # development versions)
+                    doc.path = self.path
+
             if not self.one_dot_version in doc.versions:
                 doc.versions.append(self.one_dot_version)
             for lang in doc_linguas: