summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/crumbs
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-11 17:03:55 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:33 +0100
commit1180bab54e2879401f3586c91a48174191a1ee8b (patch)
treea45aeee20eb5969cc1ac778fac47134929f4e021 /bitbake/lib/bb/ui/crumbs
parent5b216c8000dbc3ed9f3e996242eb24269fcaf919 (diff)
downloadpoky-1180bab54e2879401f3586c91a48174191a1ee8b.tar.gz
Apply some 2to3 transforms that don't cause issues in 2.6
(Bitbake rev: d39ab776e7ceaefc8361150151cf0892dcb70d9c) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-rw-r--r--bitbake/lib/bb/ui/crumbs/buildmanager.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/runningbuild.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/buildmanager.py b/bitbake/lib/bb/ui/crumbs/buildmanager.py
index 37a62f189f..b5a4dae0de 100644
--- a/bitbake/lib/bb/ui/crumbs/buildmanager.py
+++ b/bitbake/lib/bb/ui/crumbs/buildmanager.py
@@ -157,7 +157,7 @@ class BuildResult(gobject.GObject):
157 # format build-<year><month><day>-<ordinal> we can easily 157 # format build-<year><month><day>-<ordinal> we can easily
158 # pull it out. 158 # pull it out.
159 # TODO: Better to stat a file? 159 # TODO: Better to stat a file?
160 (_ , date, revision) = identifier.split ("-") 160 (_, date, revision) = identifier.split ("-")
161 print(date) 161 print(date)
162 162
163 year = int (date[0:4]) 163 year = int (date[0:4])
@@ -385,7 +385,7 @@ class BuildManager (gobject.GObject):
385 build_directory]) 385 build_directory])
386 server.runCommand(["buildTargets", [conf.image], "rootfs"]) 386 server.runCommand(["buildTargets", [conf.image], "rootfs"])
387 387
388 except Exception, e: 388 except Exception as e:
389 print(e) 389 print(e)
390 390
391class BuildManagerTreeView (gtk.TreeView): 391class BuildManagerTreeView (gtk.TreeView):
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py
index 79e2c9060d..b4416ecbb3 100644
--- a/bitbake/lib/bb/ui/crumbs/runningbuild.py
+++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py
@@ -63,7 +63,7 @@ class RunningBuild (gobject.GObject):
63 # for the message. 63 # for the message.
64 if hasattr(event, 'pid'): 64 if hasattr(event, 'pid'):
65 pid = event.pid 65 pid = event.pid
66 if self.pids_to_task.has_key(pid): 66 if pid in self.pids_to_task:
67 (package, task) = self.pids_to_task[pid] 67 (package, task) = self.pids_to_task[pid]
68 parent = self.tasks_to_iter[(package, task)] 68 parent = self.tasks_to_iter[(package, task)]
69 69
@@ -93,12 +93,12 @@ class RunningBuild (gobject.GObject):
93 (package, task) = (event._package, event._task) 93 (package, task) = (event._package, event._task)
94 94
95 # Save out this PID. 95 # Save out this PID.
96 self.pids_to_task[pid] = (package,task) 96 self.pids_to_task[pid] = (package, task)
97 97
98 # Check if we already have this package in our model. If so then 98 # Check if we already have this package in our model. If so then
99 # that can be the parent for the task. Otherwise we create a new 99 # that can be the parent for the task. Otherwise we create a new
100 # top level for the package. 100 # top level for the package.
101 if (self.tasks_to_iter.has_key ((package, None))): 101 if ((package, None) in self.tasks_to_iter):
102 parent = self.tasks_to_iter[(package, None)] 102 parent = self.tasks_to_iter[(package, None)]
103 else: 103 else:
104 parent = self.model.append (None, (None, 104 parent = self.model.append (None, (None,