Release Upgrader

Merge ~enr0n/ubuntu-release-upgrader:lp.1947581 into ubuntu-release-upgrader:ubuntu/main

  1. Git
  2. lp:~enr0n/ubuntu-release-upgrader
  3. lp.1947581
  4. Merge into ubuntu/main
Proposed by Nick Rosbrook
Status: Merged
Merged at revision: db4b35f9c4024c4dd36134b2f239de75f8dce1ba
Proposed branch: ~enr0n/ubuntu-release-upgrader:lp.1947581
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 35 lines (+8/-4)
2 files modified
DistUpgrade/DistUpgradeView.py (+4/-4)
debian/changelog (+4/-0)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+415051@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This looks great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
2index 3d9510f..8b8b904 100644
3--- a/DistUpgrade/DistUpgradeView.py
4+++ b/DistUpgrade/DistUpgradeView.py
5@@ -167,10 +167,10 @@ class AcquireProgress(apt.progress.base.AcquireProgress):
6 def estimatedDownloadTime(self, required_download):
7 """ get the estimated download time """
8 if self.est_speed == 0:
9- timeModem = required_download/(56*1024/8) # 56 kbit
10- timeDSL = required_download/(1024*1024/8) # 1Mbit = 1024 kbit
11- s= _("This download will take about %s with a 1Mbit DSL connection "
12- "and about %s with a 56k modem.") % (FuzzyTimeToStr(timeDSL), FuzzyTimeToStr(timeModem))
13+ time5Mbit = required_download/(5*1000*1000/8) # 1Mbit = 1000 kbit
14+ time40Mbit = required_download/(40*1000*1000/8)
15+ s= _("This download will take about %s with a 40Mbit connection "
16+ "and about %s with a 5Mbit connection.") % (FuzzyTimeToStr(time40Mbit), FuzzyTimeToStr(time5Mbit))
17 return s
18 # if we have a estimated speed, use it
19 s = _("This download will take about %s with your connection. ") % FuzzyTimeToStr(required_download/self.est_speed)
20diff --git a/debian/changelog b/debian/changelog
21index 122bd90..5a85141 100644
22--- a/debian/changelog
23+++ b/debian/changelog
24@@ -1,7 +1,11 @@
25 ubuntu-release-upgrader (1:22.04.5) UNRELEASED; urgency=medium
26
27+ [ Brian Murray ]
28 * debian/control: rename the main branch
29
30+ [ Nick Rosbrook ]
31+ * DistUpgrade: update download rates in estimated download message (LP: #1947581)
32+
33 -- Brian Murray <brian@ubuntu.com> Fri, 28 Jan 2022 13:43:11 -0800
34
35 ubuntu-release-upgrader (1:22.04.4) jammy; urgency=medium

Subscribers

People subscribed via source and target branches