Skip to contentSkip to conversation

fixes in Dependency Explorer

GIT PULL Woronicz, Bartosz ( NSN - PL/Wroclaw) 2 participants 3 messages Jun 7, 2016 – Jun 10, 2016

lore
Share & tools
lore

Woronicz, Bartosz ( NSN - PL/Wroclaw)

author
#0 lore raw
Signature · 5 lines
-- 
Kind regards,
Bartosz Woronicz
Engineer, Software Configuration (SCM)
Nokia Networks - PL/Wroclaw

From 11f4a3e137e2eda76c8dce44c053d0db68d6b208 Mon Sep 17 00:00:00 2001
From: Bartosz Wieslaw Woronicz <[email protected]>
Date: Tue, 7 Jun 2016 17:08:16 +0200
Subject: [PATCH 1/2] depexp: remove the requirement for -g flag

---
 bitbake/lib/bb/ui/depexp.py | 3 ---
 1 file changed, 3 deletions(-)
bitbake/lib/bb/ui/depexp.py +0 -3
index 240aafc..6a6bfd5 100644
@@ -202,9 +202,6 @@ def main(server, eventHandler, params):
             print(cmdline['msg'])
             return 1
         cmdline = cmdline['action']
-        if not cmdline or cmdline[0] != "generateDotGraph":
-            print("This UI requires the -g option")
-            return 1
         ret, error = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]])
         if error:
             print("Error running command '%s': %s" % (cmdline, error))
Signature · 1 line
2.5.0

From 12215390bb16980c6aae5039c7cc6f6eceb1fa4e Mon Sep 17 00:00:00 2001
From: Bartosz Wieslaw Woronicz <[email protected]>
Date: Tue, 7 Jun 2016 17:09:16 +0200
Subject: [PATCH 2/2] depexp: fix progress bar

---
 bitbake/lib/bb/ui/depexp.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
bitbake/lib/bb/ui/depexp.py +12 -2
index 6a6bfd5..0778f9d 100644
@@ -264,7 +264,6 @@ def main(server, eventHandler, params):
                 continue
 
             if isinstance(event, bb.event.CacheLoadCompleted):
-                bardialog.hide()
                 continue
 
             if isinstance(event, bb.event.ParseStarted):

@@ -277,6 +276,17 @@ def main(server, eventHandler, params):
 
                 gtk.gdk.threads_leave()
 
+            if isinstance(event, bb.event.TreeDataPreparationStarted):
+                bardialog.set_title("Processing tree data")
+                bardialog.vbox.remove(pbar)
+                bardialog.vbox.pack_start(
+                    gtk.Label(str="Generating dependency graph data... please wait..."))
+                bardialog.show_all()
+                continue
+
+            if isinstance(event, bb.event.TreeDataPreparationProgress):
+                continue
+
             if isinstance(event, bb.event.ParseProgress):
                 x = event.current
                 gtk.gdk.threads_enter()

@@ -286,13 +296,13 @@ def main(server, eventHandler, params):
                 continue
 
             if isinstance(event, bb.event.ParseCompleted):
-                bardialog.hide()
                 continue
 
             if isinstance(event, bb.event.DepTreeGenerated):
                 gtk.gdk.threads_enter()
                 dep.parse(event._depgraph)
                 gtk.gdk.threads_leave()
+                bardialog.hide()
 
             if isinstance(event, bb.command.CommandCompleted):
                 continue
Signature · 1 line
2.5.0
author
#2 lore raw

Yeah, sure. I will send them on Monday. Thanks!

Kind regards,
Bartosz Woronicz
Engineer, Software Configuration (SCM)
Nokia Networks - PL/Wroclaw

Quoted 24 lines · Ross

Hi Bartosz,

Please can you re-send these to the bitbake list?

Thanks,
Ross

On 7 June 2016 at 16:15, Woronicz, Bartosz ( NSN - PL/Wroclaw) <[email protected] <mailto:[email protected]>> wrote:

--
Kind regards,
Bartosz Woronicz
Engineer, Software Configuration (SCM)
Nokia Networks - PL/Wroclaw

--
_______________________________________________
yocto mailing list
[email protected] <mailto:[email protected]>
https://lists.yoctoproject.org/listinfo/yocto