Merge lp:~pitti/unity-gtk-module/env-race into lp:unity-gtk-module

Proposed by Martin Pitt on 2016-09-13
Status: Merged
Approved by: Ted Gould on 2016-09-13
Approved revision: 340
Merged at revision: 339
Proposed branch: lp:~pitti/unity-gtk-module/env-race
Merge into: lp:unity-gtk-module
Diff against target: 51 lines (+4/-10)
4 files modified
data/Makefile.am (+0/-3)
data/unity-gtk-module.override (+0/-1)
data/unity-gtk-module.service (+2/-4)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~pitti/unity-gtk-module/env-race
Reviewer Review Type Date Requested Status
Ted Gould (community) 2016-09-13 Approve on 2016-09-13
Review via email: mp+305613@code.launchpad.net

Commit message

Fix $GTK_MODULES race condition

Description of the change

Fix race condition in bug 1618886 and fix Vcs-* tags.

To post a comment you must log in.
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2016-08-04 10:51:59 +0000
3+++ data/Makefile.am 2016-09-13 15:03:34 +0000
4@@ -10,7 +10,4 @@
5 systemd_userunitdir = $(SYSTEMD_USERUNITDIR)
6 systemd_userunit_DATA = unity-gtk-module.service
7
8-upstart_systemd_overridedir = $(datadir)/upstart/systemd-session/upstart/
9-upstart_systemd_override_DATA = unity-gtk-module.override
10-
11 EXTRA_DIST = $(dist_upstart_job_DATA)
12
13=== removed file 'data/unity-gtk-module.override'
14--- data/unity-gtk-module.override 2016-08-03 16:01:11 +0000
15+++ data/unity-gtk-module.override 1970-01-01 00:00:00 +0000
16@@ -1,1 +0,0 @@
17-manual
18
19=== modified file 'data/unity-gtk-module.service'
20--- data/unity-gtk-module.service 2016-08-03 16:01:11 +0000
21+++ data/unity-gtk-module.service 2016-09-13 15:03:34 +0000
22@@ -8,12 +8,10 @@
23 RemainAfterExit=yes
24 ExecStart=/bin/sh -ec '\
25 GTK_MODULES="$${GTK_MODULES:+$GTK_MODULES:}unity-gtk-module";\
26- dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
27- initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
28+ dbus-update-activation-environment --verbose --systemd GTK_MODULES'
29 ExecStopPost=/bin/sh -ec '\
30 GTK_MODULES=$$(echo -n $${GTK_MODULES} | awk -v RS=: -v ORS=: "/^unity-gtk-module$/ {next} {print}" | sed -e "s/:*$//");\
31- dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
32- initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
33+ dbus-update-activation-environment --verbose --systemd GTK_MODULES'
34
35 [Install]
36 WantedBy=ubuntu-session.target
37
38=== modified file 'debian/control'
39--- debian/control 2016-08-04 10:51:59 +0000
40+++ debian/control 2016-09-13 15:03:34 +0000
41@@ -13,8 +13,8 @@
42 # If you aren't a member of ~indicator-applet-developers but need to upload
43 # packaging changes, just go ahead. ~indicator-applet-developers will notice
44 # and sync up the code again.
45-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk
46-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk/files
47+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
48+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
49
50 Package: libunity-gtk-parser-dev-common
51 Section: libdevel

Subscribers

People subscribed via source and target branches