git-ubuntu

Merge ~racb/git-ubuntu:snap-fixes into git-ubuntu:master

  1. Git
  2. lp:~racb/git-ubuntu
  3. snap-fixes
  4. Merge into master
Proposed by Robie Basak
Status: Merged
Merged at revision: 69bf64454cfb4ffd1cd9367a38469b8a624b2860
Proposed branch: ~racb/git-ubuntu:snap-fixes
Merge into: git-ubuntu:master
Diff against target: 102 lines (+16/-7)
9 files modified
snap-wrappers/wrappers/awk (+1/-1)
snap-wrappers/wrappers/gbp (+1/-1)
snap-wrappers/wrappers/git-merge-changelogs (+1/-1)
snap-wrappers/wrappers/git-reconstruct-changelog (+1/-1)
snap-wrappers/wrappers/git-ubuntu-man (+1/-1)
snap-wrappers/wrappers/git-ubuntu-self-test (+1/-1)
snap-wrappers/wrappers/quilt (+1/-1)
snap-wrappers/wrappers/ssh (+7/-0)
snap/snapcraft.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+386886@code.launchpad.net

Commit message

Make Jenkins happy

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:91cb46ecee6f43d4e133bce708ff0e0e0bba24b2
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/526/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/526//rebuild

review: Approve (continuous-integration)
Revision history for this message
Bryce Harrington (bryce) wrote :

All looks good, I read through the discussions on the linked bugs and at the snapcraft forum, and this seems like the logical change to make based on those.

I notice there are a few #!/bin/sh scripts, would those need any adjustments?

review: Approve
Revision history for this message
Robie Basak (racb) wrote :

Thanks!

On Tue, Jul 07, 2020 at 05:44:40PM -0000, Bryce Harrington wrote:
> I notice there are a few #!/bin/sh scripts, would those need any adjustments?

Calling sh doesn't seem to have any similar issues, so I'm leaving these
for now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap-wrappers/wrappers/awk b/snap-wrappers/wrappers/awk
2index 24e0591..2d4abb7 100755
3--- a/snap-wrappers/wrappers/awk
4+++ b/snap-wrappers/wrappers/awk
5@@ -1,4 +1,4 @@
6-#!/snap/core/current/bin/bash
7+#!/snap/git-ubuntu/current/bin/bash
8
9 CORE_SNAP="/snap/core/current"
10 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
11diff --git a/snap-wrappers/wrappers/gbp b/snap-wrappers/wrappers/gbp
12index 098061d..77145d7 100755
13--- a/snap-wrappers/wrappers/gbp
14+++ b/snap-wrappers/wrappers/gbp
15@@ -1,4 +1,4 @@
16-#!/snap/core/current/bin/bash
17+#!/snap/git-ubuntu/current/bin/bash
18
19 CORE_SNAP="/snap/core/current"
20 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
21diff --git a/snap-wrappers/wrappers/git-merge-changelogs b/snap-wrappers/wrappers/git-merge-changelogs
22index d751f45..e78ce69 100755
23--- a/snap-wrappers/wrappers/git-merge-changelogs
24+++ b/snap-wrappers/wrappers/git-merge-changelogs
25@@ -1,4 +1,4 @@
26-#!/snap/core/current/bin/bash
27+#!/snap/git-ubuntu/current/bin/bash
28
29 set -e
30
31diff --git a/snap-wrappers/wrappers/git-reconstruct-changelog b/snap-wrappers/wrappers/git-reconstruct-changelog
32index 4b60e79..8fbb9f9 100755
33--- a/snap-wrappers/wrappers/git-reconstruct-changelog
34+++ b/snap-wrappers/wrappers/git-reconstruct-changelog
35@@ -1,4 +1,4 @@
36-#!/snap/core/current/bin/bash
37+#!/snap/git-ubuntu/current/bin/bash
38
39 set -e
40
41diff --git a/snap-wrappers/wrappers/git-ubuntu-man b/snap-wrappers/wrappers/git-ubuntu-man
42index 99f99e4..623cdd2 100755
43--- a/snap-wrappers/wrappers/git-ubuntu-man
44+++ b/snap-wrappers/wrappers/git-ubuntu-man
45@@ -1,3 +1,3 @@
46-#!/snap/core/current/bin/bash
47+#!/snap/git-ubuntu/current/bin/bash
48
49 man -M $SNAP/usr/share/man $@ 2>/dev/null || man $@
50diff --git a/snap-wrappers/wrappers/git-ubuntu-self-test b/snap-wrappers/wrappers/git-ubuntu-self-test
51index edae48b..699fb59 100755
52--- a/snap-wrappers/wrappers/git-ubuntu-self-test
53+++ b/snap-wrappers/wrappers/git-ubuntu-self-test
54@@ -1,4 +1,4 @@
55-#!/snap/core/current/bin/bash
56+#!/snap/git-ubuntu/current/bin/bash
57
58 function die() {
59 echo "Error: ${*}" 1>&2
60diff --git a/snap-wrappers/wrappers/quilt b/snap-wrappers/wrappers/quilt
61index e54a718..ed09371 100755
62--- a/snap-wrappers/wrappers/quilt
63+++ b/snap-wrappers/wrappers/quilt
64@@ -1,4 +1,4 @@
65-#!/snap/core/current/bin/bash
66+#!/snap/git-ubuntu/current/bin/bash
67
68 CORE_SNAP="/snap/core/current"
69 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
70diff --git a/snap-wrappers/wrappers/ssh b/snap-wrappers/wrappers/ssh
71new file mode 100755
72index 0000000..92f8b3d
73--- /dev/null
74+++ b/snap-wrappers/wrappers/ssh
75@@ -0,0 +1,7 @@
76+#!/snap/git-ubuntu/current/bin/bash
77+
78+# Use the host's ssh. As an exception to git-ubuntu embedding everything
79+# required in the snap, LP: #1871827 showed us that we really depend on the
80+# user's ssh configuration on the host and on further thought it is the user's
81+# expectation that their host ssh configuration be used.
82+exec /usr/bin/ssh "$@"
83diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
84index 4bf1ec2..a2b16c3 100644
85--- a/snap/snapcraft.yaml
86+++ b/snap/snapcraft.yaml
87@@ -364,6 +364,7 @@ parts:
88 build-packages:
89 - libsystemd-dev
90 stage-packages:
91+ - bash
92 - fakeroot
93 - libffi-dev
94 - libssl-dev
95@@ -418,6 +419,7 @@ parts:
96 wrappers/gbp: usr/local/bin/gbp
97 wrappers/quilt: usr/local/bin/quilt
98 wrappers/awk: usr/local/bin/awk
99+ wrappers/ssh: usr/local/bin/ssh
100 manpages:
101 source: man/
102 plugin: dump

Subscribers

People subscribed via source and target branches