jhbuild r1823 - in trunk: . jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Wed Jan 16 16:50:16 2008
New Revision: 1823
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1823&view=rev

Log:
* jhbuild/moduleset.py: fixed dot command to work with latest Tarball
changes.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/moduleset.py

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Wed Jan 16 16:50:16 2008
@@ -132,7 +132,7 @@
     def write_dot(self, modules=None, fp=sys.stdout):
         from jhbuild.modtypes import MetaModule
         from jhbuild.modtypes.autotools import AutogenModule
-        from jhbuild.modtypes.tarball import Tarball
+        from jhbuild.versioncontrol.tarball import TarballBranch
         
         if modules is None:
             modules = self.modules.keys()
@@ -154,15 +154,14 @@
             if isinstance(mod, MetaModule):
                 attrs = '[color="lightcoral",style="filled",' \
                         'label="%s"]' % mod.name
-            elif isinstance(mod, Tarball):
-                attrs = '[color="lightgoldenrod",style="filled",' \
-                        'label="%s\\n%s"]' % (mod.name, mod.version)
             else:
                 label = mod.name
+                color = 'lightskyblue'
                 if mod.branch.branchname:
                     label += '\\n(%s)' % mod.branch.branchname
-                attrs = '[color="lightskyblue",style="filled",label="%s"]' % \
-                        label
+                if isinstance(mod.branch, TarballBranch):
+                    color = 'lightgoldenrod'
+                attrs = '[color="%s",style="filled",label="%s"]' % (color, label)
             fp.write('  "%s" %s;\n' % (modname, attrs))
             del modules[0]