Merge ~nteodosio/ubuntu-release-upgrader:ubuntu/main into ubuntu-release-upgrader:ubuntu/main

Proposed by Nathan Teodosio
Status: Merged
Merge reported by: Nick Rosbrook
Merged at revision: 3af1ea3bdad6ba453f921b2be49af64f745abc8f
Proposed branch: ~nteodosio/ubuntu-release-upgrader:ubuntu/main
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 28 lines (+8/-1)
2 files modified
DistUpgrade/DistUpgradeController.py (+1/-1)
debian/changelog (+7/-0)
Reviewer Review Type Date Requested Status
Nick Rosbrook Approve
Review via email: mp+464689@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nick Rosbrook (enr0n) wrote :

LGTM, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
2index e43b721..3015a0f 100644
3--- a/DistUpgrade/DistUpgradeController.py
4+++ b/DistUpgrade/DistUpgradeController.py
5@@ -412,7 +412,7 @@ class DistUpgradeController(object):
6 if os.path.exists(debian_defaults):
7 config = SafeConfigParser()
8 with open(debian_defaults) as f:
9- config.readfp(f)
10+ config.read_file(f)
11 try:
12 expected_default = config.get('DEFAULT', 'default-version')
13 except NoOptionError:
14diff --git a/debian/changelog b/debian/changelog
15index 3468066..c6f9afa 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,10 @@
19+ubuntu-release-upgrader (1:24.04.16) noble; urgency=medium
20+
21+ * DistUpgrade: readfp was replaced by read_file in configparser
22+ (LP: #2062435).
23+
24+ -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com> Fri, 19 Apr 2024 15:11:26 +0200
25+
26 ubuntu-release-upgrader (1:24.04.15) noble; urgency=medium
27
28 * DistUpgrade.cfg.jammy: keep {netfilter,iptables}-persistent installed

Subscribers

People subscribed via source and target branches