[jhbuild] Add virtual sysdeps afer merging module sets

[Christoph Reiter <creiter src gnome org>]

commit b434f6eef3548dfe7cf66d3f6f4608d911460588
Author: Christoph Reiter <creiter src gnome org>
Date:   Sun Feb 14 11:24:30 2016 +0100

    Add virtual sysdeps afer merging module sets
    
    Instead of adding virtual sysdeps after parsing each module
    add it after merging all modules. This fixes the case
    where a package defined not in the last moduleset that is part
    of the virtual sysdep list to be ignored.

 jhbuild/moduleset.py |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index c310377..2d5a2b4 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -373,6 +373,19 @@ def load(config, uri=None):
             uri = 'https://git.gnome.org/browse/jhbuild/plain/modulesets' \
                   '/%s.modules' % uri
         ms.modules.update(_parse_module_set(config, uri).modules)
+
+    # create virtual sysdeps
+    system_repo_class = get_repo_type('system')
+    virtual_repo = system_repo_class(config, 'virtual-sysdeps')
+    virtual_branch = virtual_repo.branch('virtual-sysdeps') # just reuse this
+    for name in virtual_sysdeps:
+        # don't override it if it's already there
+        if name in ms.modules:
+            continue
+
+        virtual = SystemModule.create_virtual(name, virtual_branch, 'path', name)
+        ms.add(virtual)
+
     return ms
 
 def load_tests (config, uri=None):
@@ -543,18 +556,6 @@ def _parse_module_set(config, uri):
             module.moduleset_name = moduleset_name
             moduleset.add(module)
 
-    # create virtual sysdeps
-    system_repo_class = get_repo_type('system')
-    virtual_repo = system_repo_class(config, 'virtual-sysdeps')
-    virtual_branch = virtual_repo.branch('virtual-sysdeps') # just reuse this
-    for name in virtual_sysdeps:
-        # don't override it if it's already there
-        if name in moduleset.modules:
-            continue
-
-        virtual = SystemModule.create_virtual(name, virtual_branch, 'path', name)
-        moduleset.add (virtual)
-
     # keep default repository around, used when creating automatic modules
     global _default_repo
     if default_repo: