[library-web] mallard: fix combination of modules from different modulesets

[Frederic Peters <fpeters src gnome org>]

commit 45f831c95e01b058d6148ea2e9a526d103f22118
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon Aug 10 16:08:46 2015 +0200

    mallard: fix combination of modules from different modulesets
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694675

 src/lgo.py |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/lgo.py b/src/lgo.py
index e06e862..9387b8f 100755
--- a/src/lgo.py
+++ b/src/lgo.py
@@ -276,13 +276,14 @@ class Lgo(App):
                         'pub/GNOME/teams/releng/%(r)s/gnome-suites-core-deps-%(r)s.modules']
 
             logging.info('Getting GNOME release: %s' % r)
+            doc_modules = []
             for url in urls:
                 try:
                     moduleset = self.ftp_gnome_org.download(url % {'r': r})[1]
                 except Exception, e:
                     logging.error('Failed retrieving %s (%s)' % (url % {'r': r}, str(e)))
                     continue
-                self.process_moduleset(moduleset, r)
+                doc_modules.extend(self.get_doc_modules(moduleset, r))
 
                 if self.config.version_max is None and r == releases[-1]:
                     # this is the last release, and no maximum version was set,
@@ -296,6 +297,11 @@ class Lgo(App):
                     moduleset.seek(0)
                     self.process_stable_moduleset(moduleset, r)
 
+            for doc_module in self.fix_modules_order(doc_modules):
+                logging.info('processing %s (from %s moduleset)' % (
+                            doc_module, r))
+                doc_module.process()
+
     def download(self, url, use_cache=True):
         if url.startswith('gnome+git://'):
             parsed_url = urlparse.urlparse(url)
@@ -451,7 +457,7 @@ class Lgo(App):
 
         return filename
 
-    def process_moduleset(self, moduleset, version_number):
+    def get_doc_modules(self, moduleset, version_number):
         '''Download tarballs from a module set'''
 
         doc_modules = []
@@ -515,10 +521,8 @@ class Lgo(App):
         tree = ET.ElementTree(gduxrefs)
         tree.write(os.path.join(tmp_dirname, 'gduxrefs.xml'))
 
-        for doc_module in self.fix_modules_order(doc_modules):
-            logging.info('processing %s (from %s moduleset)' % (
-                        doc_module, version_number))
-            doc_module.process()
+        return doc_modules
+
 
     def process_latest_moduleset(self, moduleset):
         '''Register all modules from latest modulesets as extra tarballs