Snappy

Merge lp:~mvo/snappy/snappy-remove-bin-path-compat into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. snappy-remove-bin-path-compat
  2. Merge into snappy-moved-to-github
Proposed by Michael Vogt on 2015-06-10
Status: Merged
Approved by: John Lenton on 2015-06-11
Approved revision: 500
Merged at revision: 504
Proposed branch: lp:~mvo/snappy/snappy-remove-bin-path-compat
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 27 lines (+0/-6)
2 files modified
snappy/click.go (+0/-3)
snappy/click_test.go (+0/-3)
To merge this branch: bzr merge lp:~mvo/snappy/snappy-remove-bin-path-compat
Reviewer Review Type Date Requested Status
John Lenton 2015-06-10 Approve on 2015-06-11
Review via email: mp+261596@code.launchpad.net

Commit Message

Remove compatibility for click-bin-path in generated exec-wrappers.

Description of the Change

Tiny branch that removes compat for click-bin-path in the generated
exec wrappers.

To post a comment you must log in.
John Lenton (chipaca) wrote :

> -# !!!never remove this line!!!

But... but...

;-)

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-06-09 17:11:43 +0000
3+++ snappy/click.go 2015-06-10 09:27:46 +0000
4@@ -289,9 +289,6 @@
5
6 func generateSnapBinaryWrapper(binary Binary, pkgPath, aaProfile string, m *packageYaml) (string, error) {
7 wrapperTemplate := `#!/bin/sh
8-# !!!never remove this line!!!
9-##TARGET={{.Target}}
10-
11 set -e
12
13 # app info (deprecated)
14
15=== modified file 'snappy/click_test.go'
16--- snappy/click_test.go 2015-06-09 19:11:54 +0000
17+++ snappy/click_test.go 2015-06-10 09:27:46 +0000
18@@ -740,9 +740,6 @@
19 }
20
21 const expectedWrapper = `#!/bin/sh
22-# !!!never remove this line!!!
23-##TARGET=/apps/pastebinit.mvo/1.4.0.0.1/bin/pastebinit
24-
25 set -e
26
27 # app info (deprecated)

Subscribers

People subscribed via source and target branches