Unity

Merge lp:~didrocks/unity/fix-gerror-triggering into lp:unity

  1. fix-gerror-triggering
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2455
Proposed branch: lp:~didrocks/unity/fix-gerror-triggering
Merge into: lp:unity
Diff against target: 19 lines (+2/-1)
1 file modified
tools/unity.cmake (+2/-1)
To merge this branch: bzr merge lp:~didrocks/unity/fix-gerror-triggering
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
jenkins (community) continuous-integration Approve
Review via email: mp+112517@code.launchpad.net

Commit message

Fix a crash when a GError exception is triggered

Description of the change

Fix crash when GError exception is triggered, bad import

Tests:
no applicable

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:2453
http://s-jenkins:8080/job/unity-ci/38/

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unity.cmake'
2--- tools/unity.cmake 2012-06-12 06:32:09 +0000
3+++ tools/unity.cmake 2012-06-28 09:07:33 +0000
4@@ -19,6 +19,7 @@
5 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6
7 import gconf
8+import glib
9 import glob
10 from optparse import OptionParser
11 import os
12@@ -78,7 +79,7 @@
13 # as compiz set a new schema instead of a value..
14 try:
15 current_profile_schema = client.get_schema("/apps/compizconfig-1/current_profile")
16- except (GError, AttributeError), e:
17+ except (glib.GError, AttributeError), e:
18 print "WARNING: environment is incorrect: %s\nDid you just try to reset in a tty?" % e
19 return
20