Autopilot

Merge lp:~veebers/autopilot/fix-gir-gconf into lp:autopilot

  1. fix-gir-gconf
  2. Merge into trunk
Proposed by Christopher Lee
Status: Merged
Approved by: Thomi Richards
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~veebers/autopilot/fix-gir-gconf
Merge into: lp:autopilot
Diff against target: 29 lines (+2/-3)
1 file modified
bin/autopilot (+2/-3)
To merge this branch: bzr merge lp:~veebers/autopilot/fix-gir-gconf
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
jenkins continuous-integration Pending
Review via email: mp+129092@code.launchpad.net

Commit message

Dependency check for gir-gconf checks correct module

Description of the change

Dependency check for gir-gconf checks correct module

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/autopilot'
2--- bin/autopilot 2012-10-04 00:32:38 +0000
3+++ bin/autopilot 2012-10-11 03:43:19 +0000
4@@ -11,7 +11,6 @@
5
6 from codecs import open
7 from datetime import datetime
8-from imp import find_module
9 import os
10 import os.path
11 from os import putenv
12@@ -31,7 +30,7 @@
13 DEPENDS = [
14 ('compizconfig', 'python-compizconfig'),
15 ('dbus', 'python-dbus'),
16- ('gconf', 'gir1.2-gconf-2.0'),
17+ ('gi.repository.GConf', 'gir1.2-gconf-2.0'),
18 ('ibus', 'python-ibus'),
19 ('junitxml', 'python-junitxml'),
20 ('testscenarios', 'python-testscenarios'),
21@@ -51,7 +50,7 @@
22 missing = []
23 for module_name, package_name in DEPENDS:
24 try:
25- find_module(module_name)
26+ __import__(module_name)
27 except ImportError:
28 missing.append(package_name)
29 if missing:

Subscribers

People subscribed via source and target branches