simplestreams

Merge ~oddbloke/simplestreams/+git/simplestreams:ssgit into simplestreams:master

  1. Git
  2. lp:~oddbloke/simplestreams/+git/simplestreams
  3. ssgit
  4. Merge into master
Proposed by Dan Watkins
Status: Merged
Approved by: Scott Moser
Approved revision: de85beae785bec6694645aba5e6fcba7687d9f04
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~oddbloke/simplestreams/+git/simplestreams:ssgit
Merge into: simplestreams:master
Diff against target: 12 lines (+1/-1)
1 file modified
tools/tenv (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Scott Moser (community) Approve
Review via email: mp+360086@code.launchpad.net

Commit message

tenv: Put topdir/bin before topdir/tools in PATH

This means that the bin/sstream-mirror-glance Python script (rather than
the tools/sstream-mirror-glance shell script that redirects to the
Python script) comes first in PATH.

Description of the change

tenv: Put topdir/bin before topdir/tools in PATH

This means that the bin/sstream-mirror-glance Python script (rather than
the tools/sstream-mirror-glance shell script that redirects to the
Python script) comes first in PATH.

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

FAILED: Continuous integration, rev:de85beae785bec6694645aba5e6fcba7687d9f04
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~daniel-thewatkins/simplestreams/+git/simplestreams/+merge/360086/+edit-commit-message

https://jenkins.ubuntu.com/server/job/simplestreams-ci/80/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/80
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/80
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/80

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

i approve pending ci-bot ack.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:de85beae785bec6694645aba5e6fcba7687d9f04
https://jenkins.ubuntu.com/server/job/simplestreams-ci/81/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/81
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/81
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/81

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/tenv b/tools/tenv
2index 3866626..629285e 100755
3--- a/tools/tenv
4+++ b/tools/tenv
5@@ -16,6 +16,6 @@ fi
6
7 export GNUPGHOME="$topdir/gnupg"
8 export PYTHONPATH="$topdir${PYTHONPATH:+:${PYTHONPATH}}"
9-export PATH=$topdir/tools:$topdir/bin:$PATH
10+export PATH=$topdir/bin:$topdir/tools:$PATH
11 export TENV_SETUP=1
12 exec "$@"

Subscribers

People subscribed via source and target branches

to all changes: