From e5a63fd66b7855e0c9cafb788d95294e1b06ba58 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 5 Apr 2012 10:56:43 -0700 Subject: hob: update required versions of (py)gtk et al With the previous two changes we now work on Gtk+ 2.18 and PyGtk 2.16 (Bitbake rev: 5ccbcdf8c47f2f20655a3ea0f60e5870cdba6f83) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/hob.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 1321ebbac7..6cd9579633 100755 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py @@ -22,15 +22,18 @@ import sys import os -requirements = "FATAL: pygtk (version 2.22.0 or later) and pygobject are required to use Hob" +requirements = "FATAL: Gtk+, PyGtk and PyGobject are required to use Hob" try: import gobject import gtk import pygtk pygtk.require('2.0') # to be certain we don't have gtk+ 1.x !?! - ver = gtk.pygtk_version - if ver < (2, 22, 0): - sys.exit("%s (you have pygtk %s.%s.%s)." % (requirements, ver[0], ver[1], ver[2])) + gtkver = gtk.gtk_version + pygtkver = gtk.pygtk_version + if gtkver < (2, 18, 0) or pygtkver < (2, 16, 0): + sys.exit("%s,\nYou have Gtk+ %s and PyGtk %s." % (requirements, + ".".join(map(str, gtkver)), + ".".join(map(str, pygtkver)))) except ImportError as exc: sys.exit("%s (%s)." % (requirements, str(exc))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) -- cgit v1.2.3-54-g00ecf