Ubuntu CD Images

Merge lp:~fo0bar/ubuntu-cdimage/bittorrent into lp:ubuntu-cdimage

  1. bittorrent
  2. Merge into mainline
Proposed by Ryan Finnie
Status: Merged
Merged at revision: 1809
Proposed branch: lp:~fo0bar/ubuntu-cdimage/bittorrent
Merge into: lp:ubuntu-cdimage
Diff against target: 41 lines (+6/-6)
2 files modified
lib/cdimage/tests/test_tree.py (+4/-4)
lib/cdimage/tree.py (+2/-2)
To merge this branch: bzr merge lp:~fo0bar/ubuntu-cdimage/bittorrent
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+367615@code.launchpad.net

Commit message

Generate torrents with https://{ipv6.,}torrent.ubuntu.com/announce instead of http :6969

Description of the change

Redirects are in place from the old location to the new https -- regeneration of the existing supported releases would be nice but isn't strictly necessary.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/cdimage/tests/test_tree.py'
2--- lib/cdimage/tests/test_tree.py 2019-05-07 18:35:15 +0000
3+++ lib/cdimage/tests/test_tree.py 2019-05-19 22:02:51 +0000
4@@ -2379,7 +2379,7 @@
5 self.assertLogEqual(
6 ["Creating torrent for %s ..." % path for path in paths])
7 command_base = [
8- "btmakemetafile", "http://torrent.ubuntu.com:6969/announce",
9+ "btmakemetafile", "https://torrent.ubuntu.com/announce",
10 "--comment", "Ubuntu CD cdimage.ubuntu.com",
11 ]
12 mock_check_call.assert_has_calls([
13@@ -2670,10 +2670,10 @@
14 publisher.make_torrents(
15 os.path.join(self.temp_dir, "dir"), "ubuntu-13.04")
16 command_base = [
17- "btmakemetafile", "http://torrent.ubuntu.com:6969/announce",
18+ "btmakemetafile", "https://torrent.ubuntu.com/announce",
19 "--announce_list",
20- ("http://torrent.ubuntu.com:6969/announce|"
21- "http://ipv6.torrent.ubuntu.com:6969/announce"),
22+ ("https://torrent.ubuntu.com/announce|"
23+ "https://ipv6.torrent.ubuntu.com/announce"),
24 "--comment", "Ubuntu CD releases.ubuntu.com",
25 ]
26 mock_check_call.assert_has_calls([
27
28=== modified file 'lib/cdimage/tree.py'
29--- lib/cdimage/tree.py 2019-05-07 18:35:15 +0000
30+++ lib/cdimage/tree.py 2019-05-19 22:02:51 +0000
31@@ -2878,8 +2878,8 @@
32 Releases are always copies of a nominated daily build.
33 """
34
35- torrent_tracker = "http://torrent.ubuntu.com:6969/announce"
36- ipv6_torrent_tracker = "http://ipv6.torrent.ubuntu.com:6969/announce"
37+ torrent_tracker = "https://torrent.ubuntu.com/announce"
38+ ipv6_torrent_tracker = "https://ipv6.torrent.ubuntu.com/announce"
39
40 def __init__(self, tree, image_type, official, status=None, dry_run=False):
41 super(ReleasePublisher, self).__init__(tree, image_type)

Subscribers

People subscribed via source and target branches