Snappy

Merge lp:~mvo/snappy/snappy-fix-gccgo-builds into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. snappy-fix-gccgo-builds
  2. Merge into snappy-moved-to-github
Proposed by Michael Vogt
Status: Merged
Approved by: Michael Vogt
Approved revision: 309
Merged at revision: 314
Proposed branch: lp:~mvo/snappy/snappy-fix-gccgo-builds
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 34 lines (+6/-3)
1 file modified
snappy/click.go (+6/-3)
To merge this branch: bzr merge lp:~mvo/snappy/snappy-fix-gccgo-builds
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+255349@code.launchpad.net

Commit message

Fix gccgo FTBFS (lp: #1440757)

Description of the change

This fixes a gccgo FTBFS (lp: #1440757)

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy/click.go'
2--- snappy/click.go 2015-04-07 09:21:57 +0000
3+++ snappy/click.go 2015-04-07 12:15:28 +0000
4@@ -407,7 +407,7 @@
5 [Service]
6 ExecStart={{.FullPathStart}}
7 WorkingDirectory={{.AppPath}}
8-Environment="SNAPP_APP_PATH={{.AppPath}}" "SNAPP_APP_DATA_PATH=/var/lib{{.AppPath}}" "SNAPP_APP_USER_DATA_PATH=%h{{.AppPath}}" "SNAP_APP_PATH={{.AppPath}}" "SNAP_APP_DATA_PATH=/var/lib{{.AppPath}}" "SNAP_APP_USER_DATA_PATH=%h{{.AppPath}}" "SNAP_APP={{.AppTriple}}" "TMPDIR=/tmp/snaps/{{.packageYaml.Name}}/{{.Version}}/tmp" "SNAP_APP_TMPDIR=/tmp/snaps/{{.packageYaml.Name}}/{{.Version}}/tmp"
9+Environment="SNAPP_APP_PATH={{.AppPath}}" "SNAPP_APP_DATA_PATH=/var/lib{{.AppPath}}" "SNAPP_APP_USER_DATA_PATH=%h{{.AppPath}}" "SNAP_APP_PATH={{.AppPath}}" "SNAP_APP_DATA_PATH=/var/lib{{.AppPath}}" "SNAP_APP_USER_DATA_PATH=%h{{.AppPath}}" "SNAP_APP={{.AppTriple}}" "TMPDIR=/tmp/snaps/{{.Name}}/{{.Version}}/tmp" "SNAP_APP_TMPDIR=/tmp/snaps/{{.Name}}/{{.Version}}/tmp"
10 AppArmorProfile={{.AaProfile}}
11 {{if .Stop}}ExecStop={{.FullPathStop}}{{end}}
12 {{if .PostStop}}ExecStopPost={{.FullPathPostStop}}{{end}}
13@@ -419,8 +419,11 @@
14 var templateOut bytes.Buffer
15 t := template.Must(template.New("wrapper").Parse(serviceTemplate))
16 wrapperData := struct {
17- packageYaml
18+ // embed service struct
19 Service
20+ // but we need more
21+ Name string
22+ Version string
23 AppPath string
24 AaProfile string
25 FullPathStart string
26@@ -428,7 +431,7 @@
27 FullPathPostStop string
28 AppTriple string
29 }{
30- *m, service, baseDir, aaProfile,
31+ service, m.Name, m.Version, baseDir, aaProfile,
32 filepath.Join(baseDir, service.Start),
33 filepath.Join(baseDir, service.Stop),
34 filepath.Join(baseDir, service.PostStop),

Subscribers

People subscribed via source and target branches