Ubuntu
ubuntu-release-upgrader package

Merge ~paelzer/ubuntu/+source/ubuntu-release-upgrader:lp-1893716-reduce-login-overhead-JAMMY into ubuntu/+source/ubuntu-release-upgrader:ubuntu/jammy-devel

  1. Git
  2. lp:~paelzer/ubuntu/+source/ubuntu-release-upgrader
  3. lp-1893716-reduce-login-overhead-JAMMY
  4. Merge into ubuntu/jammy-devel
Proposed by Christian Ehrhardt 
Status: Merged
Merge reported by: Christian Ehrhardt 
Merged at revision: fa30f997049b990a49159c045eca4d6fc4049446
Proposed branch: ~paelzer/ubuntu/+source/ubuntu-release-upgrader:lp-1893716-reduce-login-overhead-JAMMY
Merge into: ubuntu/+source/ubuntu-release-upgrader:ubuntu/jammy-devel
Diff against target: 33 lines (+13/-1)
2 files modified
debian/91-release-upgrade (+6/-1)
debian/changelog (+7/-0)
Reviewer Review Type Date Requested Status
Brian Murray (community) Approve
Canonical Server packageset reviewers Pending
Canonical Server Pending
git-ubuntu import Pending
Review via email: mp+417913@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-1893716-recude-login-overhead-jammy

Details and test cases in the bug (linked above).

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Added a review slot for Brian who in the past dealt with update-manager/release-upgrader things.

Revision history for this message
Simon Déziel (sdeziel) wrote :

LGTM, with a tiny change proposed in the diff.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thank you Simon, updated branch and PPA.

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

This is the wrong target branch but the patch is simple enough I'll just manually merge it. The correct branch is here:

Vcs-Git: https://git.launchpad.net/ubuntu-release-upgrader -b ubuntu/main

Revision history for this message
Brian Murray (brian-murray) :
review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks, fetched the repo you referenced as "the upstream repo" for this case.
Seeing it there as part of 1:22.04.8 - thanks Brian!

It isn't uploaded yet - will you do so before jammy release as there are other fixes from you in it?

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Ok seeing [1] exists and migrated \o/
one down, two to go

[1]: https://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/1:22.04.8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/91-release-upgrade b/debian/91-release-upgrade
2index dc2ae10..c89645d 100755
3--- a/debian/91-release-upgrade
4+++ b/debian/91-release-upgrade
5@@ -1,7 +1,12 @@
6 #!/bin/sh
7
8 # if the current release is under development there won't be a new one
9-if [ "$(lsb_release -sd | cut -d' ' -f4)" = "(development" ]; then
10+[ -r /etc/lsb-release ] && . /etc/lsb-release
11+if [ -z "$DISTRIB_DESCRIPTION" ] && command -v lsb_release > /dev/null; then
12+ DISTRIB_DESCRIPTION=$(lsb_release -s -d)
13+fi
14+
15+if [ "$(echo "$DISTRIB_DESCRIPTION" | cut -d' ' -f4)" = "(development" ]; then
16 exit 0
17 fi
18
19diff --git a/debian/changelog b/debian/changelog
20index 85faddd..57d08a6 100644
21--- a/debian/changelog
22+++ b/debian/changelog
23@@ -1,3 +1,10 @@
24+ubuntu-release-upgrader (1:22.04.8) jammy; urgency=medium
25+
26+ * d/91-release-upgrade: try to use the less expensive /etc/lsb-release
27+ to check if we are in a devel release (LP: #1893716)
28+
29+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 Mar 2022 12:26:43 +0200
30+
31 ubuntu-release-upgrader (1:22.04.7) jammy; urgency=medium
32
33 [ Brian Murray ]

Subscribers

People subscribed via source and target branches