jhbuild r1848 - in trunk: . jhbuild jhbuild/commands modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Fri Jan 18 22:23:19 2008
New Revision: 1848
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1848&view=rev

Log:
* jhbuild/commands/rdepends.py, jhbuild/moduleset.py,
modulesets/hildon.modules: removed obvious cycle dependency of openobex
on itself; also fixed rdepends to silently ignore cycle dependencies.
(closes: #510498)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/commands/rdepends.py
   trunk/jhbuild/moduleset.py
   trunk/modulesets/hildon.modules

Modified: trunk/jhbuild/commands/rdepends.py
==============================================================================
--- trunk/jhbuild/commands/rdepends.py	(original)
+++ trunk/jhbuild/commands/rdepends.py	Fri Jan 18 22:23:19 2008
@@ -50,7 +50,8 @@
         # get all modules but those that are a dependency of modname
         dependencies_list = [x.name for x in module_set.get_module_list([modname])]
         dependencies_list.remove(modname)
-        modules = module_set.get_full_module_list(skip = dependencies_list)
+        modules = module_set.get_full_module_list(skip = dependencies_list,
+                ignore_cycles = True)
         modules = modules[[x.name for x in modules].index(modname)+1:]
 
         # iterate over remaining modules, and print those with modname as dep;
@@ -62,7 +63,7 @@
                 if modname in module.dependencies:
                     print module.name
             else:
-                module_list = module_set.get_module_list([module.name])
+                module_list = module_set.get_module_list([module.name], ignore_cycles=True)
                 if modname in [x.name for x in module_list]:
                     seen_modules.append(module.name)
                     deps = ''

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Fri Jan 18 22:23:19 2008
@@ -69,7 +69,7 @@
                 i = i + 1
         return ret
 
-    def get_module_list(self, seed, skip=[]):
+    def get_module_list(self, seed, skip=[], ignore_cycles = False):
         '''gets a list of module objects (in correct dependency order)
         needed to build the modules in the seed list'''
 
@@ -117,7 +117,7 @@
                 return
             if state.get(module, 'clean') == 'in-progress':
                 # dependency circle, abort when processing hard dependencies
-                if mode == 'dependencies':
+                if mode == 'dependencies' and not ignore_cycles:
                     raise DependencyCycleError()
                 else:
                     state[module] = 'in-progress'
@@ -149,8 +149,9 @@
 
         return ordered
     
-    def get_full_module_list(self, skip=[]):
-        return self.get_module_list(self.modules.keys(), skip=skip)
+    def get_full_module_list(self, skip=[], ignore_cycles=False):
+        return self.get_module_list(self.modules.keys(), skip=skip,
+                ignore_cycles=ignore_cycles)
 
     def get_test_module_list (self, seed, skip=[]):
         test_modules = []

Modified: trunk/modulesets/hildon.modules
==============================================================================
--- trunk/modulesets/hildon.modules	(original)
+++ trunk/modulesets/hildon.modules	Fri Jan 18 22:23:19 2008
@@ -57,9 +57,6 @@
 
   <autotools id="openobex">
     <branch repo="maemo.org-connectivity" module="openobex/tags/openobex-1.3osso1" checkoutdir="openobex-1.3osso1" />
-    <dependencies>
-      <dep package="openobex" />
-    </dependencies>
   </autotools>
 
   <autotools id="bluez-libs"> <!-- The .pc file is just called bluez. murrayc -->