Skip to contentSkip to conversation

: Fix GraphViz .dot output for rdepends and rrecs (BitBake 1.10)

PATCH In review Matt Johnson 2 participants 2 messages Oct 29, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Fix GraphViz .dot output for rdepends and rrecs (BitBake 1.10)

The below patch fixes rdepends and rrecs GraphViz output. These two are put into the rdepends data structure differently than the rest, and without this patch, each character gets its own vertex, which is wrong and creates massive .dot files. The fix is similar to a previous one documented here: http://bugs.openembedded.org/attachment.cgi?id=13797&action=diff <http://bugs.openembedded.org/attachment.cgi?id=13797&action=diff> . I have submitted the patch to the BitBake developer list too.

bb/cooker.py 2010-10-29 16:17:12.367546106 -0500 renamed from bb/cooker.py.busted 2010-10-29 16:15:01.157515847 -0500 +4 -4
diff -uNr lib/bb/cooker.py.busted lib/bb/cooker.py
@@ -435,11 +435,11 @@
             for depend in depgraph["depends"][pn]:
                 print >> depends_file, '"%s" -> "%s"' % (package, depend)
         for package in depgraph["rdepends-pkg"]:
-            for rdepend in depgraph["rdepends-pkg"][package]:
-                print >> depends_file, '"%s" -> "%s" [style=dashed]' % (package, rdepend)
+            for rdepend in re.findall("([\w.-]+)(\ \(.+\))?", ''.join(depgraph["rdepends-pkg"][package])):
+                print >> depends_file, '"%s" -> "%s%s" [style=dashed]' % (package, rdepend[0], rdepend[1])
         for package in depgraph["rrecs-pkg"]:
-            for rdepend in depgraph["rrecs-pkg"][package]:
-                print >> depends_file, '"%s" -> "%s" [style=dashed]' % (package, rdepend)
+            for rdepend in re.findall("([\w.-]+)(\ \(.+\))?", ''.join(depgraph["rrecs-pkg"][package])):
+                print >> depends_file, '"%s" -> "%s%s" [style=dashed]' % (package, rdepend[0], rdepend[1])
         print >> depends_file,  "}"
         bb.msg.plain("Package dependencies saved to 

'package-depends.dot'")

#1 lore raw

Am Freitag, den 29.10.2010, 16:28 -0500 schrieb Matt Johnson:

Quoted 1 line

The below patch fixes rdepends and rrecs GraphViz output.

[…]

It looks like your MUA mangled the patch and added line breaks.

Also your Signed-of-by line is missing. Please take a look at OE’s commit policy [1].

Thanks,

Paul

[1] http://wiki.openembedded.org/index.php/Commit_Policy