Ubuntu CD Images

Merge ubuntu-cdimage:lp.2037407 into ubuntu-cdimage:main

  1. Git
  2. lp:ubuntu-cdimage
  3. lp.2037407
  4. Merge into main
Proposed by Steve Langasek
Status: Merged
Merged at revision: eb163d5788f2b425322435f66009a42552262d78
Proposed branch: ubuntu-cdimage:lp.2037407
Merge into: ubuntu-cdimage:main
Diff against target: 22 lines (+2/-2)
1 file modified
lib/cdimage/tree.py (+2/-2)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Utkarsh Gupta (community) Approve
Review via email: mp+451882@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Utkarsh Gupta (utkarsh) :
review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

I cowboyed this into production to use for publishing the riscv64 images for beta, and the speed improvement was dramatic. And the images ended up where they're supposed to.

Revision history for this message
Brian Murray (brian-murray) wrote :

Looks good to me, once it passes CI.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
2index 42ac11c..30d2f72 100644
3--- a/lib/cdimage/tree.py
4+++ b/lib/cdimage/tree.py
5@@ -3478,7 +3478,7 @@ class ReleasePublisher(Publisher):
6 if not os.path.exists(daily(ext)):
7 continue
8 if self.want_pool:
9- self.copy(daily(ext), pool(ext))
10+ self.hardlink(os.path.realpath(daily(ext)), pool(ext))
11 if self.want_dist:
12 self.symlink(pool(ext), dist(ext))
13 if daily(ext) == main_img:
14@@ -3488,7 +3488,7 @@ class ReleasePublisher(Publisher):
15 arch,
16 dist(ext))
17 if self.want_full:
18- self.copy(daily(ext), full(ext))
19+ self.hardlink(os.path.realpath(daily(ext)), full(ext))
20 if daily(ext) == main_img:
21 self.publish_release_netboot(
22 os.path.dirname(daily(ext)),

Subscribers

People subscribed via source and target branches

to all changes: