diff options
author | Cole Robinson <crobinso@redhat.com> | 2016-05-17 17:07:48 -0400 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2016-05-17 17:49:55 -0400 |
commit | dfcac3fe9c0c78053beb3aad2e4ff8db8f4c961a (patch) | |
tree | c1a1608866d905f67bb1ddf5a1e0575e54ad4285 /virt-manager | |
parent | cb4909dffb634881b6dd5310857169f32701a663 (diff) | |
download | virt-manager-dfcac3fe9c0c78053beb3aad2e4ff8db8f4c961a.tar.gz |
Bump gtk and pygobject deps to 3.14
We need to bump the gtk dep to at least 3.10 for GtkRevealer usage,
and I want to bump the pygobject higher to drop some bug workarounds.
But since the oldest thing I have that meets those requirements is
RHEL/Centos 7.3 which is at 3.14 for both, set those as the minimum
versions since that's what I'll be testing against. They are still
1.5 years old and only a bit over a year newer than the previous
versions, so it's not a huge change.
Diffstat (limited to 'virt-manager')
-rwxr-xr-x | virt-manager | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/virt-manager b/virt-manager index e8583606..36f86680 100755 --- a/virt-manager +++ b/virt-manager @@ -27,7 +27,6 @@ import sys import traceback import gi -from gi.repository import GObject gi.require_version('LibvirtGLib', '1.0') from gi.repository import LibvirtGLib @@ -43,10 +42,10 @@ import warnings # pylint: disable=wrong-import-order warnings.simplefilter("ignore") try: - # Avoid a deprecation warning about threads_init - gi.check_version("3.9.1") + gi.check_version("3.14.0") except (ValueError, AttributeError): - GObject.threads_init() + print "pygobject3 3.14.0 or later is required." + sys.exit(1) def _show_startup_error(msg, details): @@ -171,6 +170,10 @@ def main(): from gi.repository import Gtk leftovers = sys.argv[1:] + if Gtk.check_version(3, 14, 0): + print "gtk3 3.14.0 or later is required." + return + # This will error if Gtk wasn't correctly initialized Gtk.Window() @@ -186,7 +189,7 @@ def main(): msg += ": Could not open display: %s" % display logging.debug("".join(traceback.format_exc())) print msg - return 1 + return finally: sys.argv = origargv @@ -197,6 +200,10 @@ def main(): if leftovers: raise RuntimeError("Unhandled command line options '%s'" % leftovers) + logging.debug("PyGObject version: %d.%d.%d", + gi.version_info[0], + gi.version_info[1], + gi.version_info[2]) logging.debug("GTK version: %d.%d.%d", Gtk.get_major_version(), Gtk.get_minor_version(), |