summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-11-10 14:45:46 +0000
committerintrigeri <intrigeri@boum.org>2015-11-10 14:45:46 +0000
commit69ba03f0b9000766652652ea9f188e6e674680a7 (patch)
tree6d3f872c218ca967447360a183c24c056a3ccad6
parent53dd9fcb5539769f21b17dce1f9ec160f6f6a2c7 (diff)
Explicitly require specific versions of the UDisks and Gtk GIR.
At least on sid, without this I see warnings.
-rwxr-xr-xtails-installer2
-rwxr-xr-xtails-installer-launcher2
-rwxr-xr-xtails_installer/creator.py2
3 files changed, 6 insertions, 0 deletions
diff --git a/tails-installer b/tails-installer
index b14a21f..19a4432 100755
--- a/tails-installer
+++ b/tails-installer
@@ -91,6 +91,8 @@ def main():
x = raw_input("\nDone! Press any key to exit")
else:
## Start our graphical interface
+ import gi
+ gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from tails_installer.gui import TailsInstallerWindow
try:
diff --git a/tails-installer-launcher b/tails-installer-launcher
index 8c98db5..9deb011 100755
--- a/tails-installer-launcher
+++ b/tails-installer-launcher
@@ -13,8 +13,10 @@
# not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
# Floor, Boston, MA 02110-1301, USA.
+import gi
import sys
+gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from tails_installer.launcher import TailsInstallerLauncherWindow
diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index ae5f410..2e4f113 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -42,6 +42,8 @@ from datetime import datetime
from pprint import pformat
if 'linux' in sys.platform:
+ import gi
+ gi.require_version('UDisks', '2.0')
from gi.repository import UDisks, GLib
from tails_installer.utils import (_move_if_exists, _unlink_if_exists, unicode_to_utf8,