Phablet Tools

Merge lp:~cjohnston/phablet-tools/1212108 into lp:phablet-tools

  1. 1212108
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 160
Merged at revision: 162
Proposed branch: lp:~cjohnston/phablet-tools/1212108
Merge into: lp:phablet-tools
Diff against target: 14 lines (+2/-2)
1 file modified
phabletutils/ubuntuimage.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/phablet-tools/1212108
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+180041@code.launchpad.net

Commit message

Removes extra forward slash from system image download urls

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/80

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/137/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phabletutils/ubuntuimage.py'
2--- phabletutils/ubuntuimage.py 2013-08-06 22:08:03 +0000
3+++ phabletutils/ubuntuimage.py 2013-08-14 05:58:38 +0000
4@@ -47,8 +47,8 @@
5 f = resources.SignedFile(
6 file_path=os.path.join(download_dir, filename),
7 sig_path=os.path.join(download_dir, signame),
8- file_uri='%s/%s' % (uri, entry['path']),
9- sig_uri='%s/%s' % (uri, entry['signature']),
10+ file_uri='%s%s' % (uri, entry['path']),
11+ sig_uri='%s%s' % (uri, entry['signature']),
12 file_hash=entry['checksum'])
13 files.append(f)
14 command_part += 'update %s %s\n' % (filename, signame)

Subscribers

People subscribed via source and target branches