Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:bionic-uatools-fix-dep8-1757490 into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

Proposed by Andreas Hasenack on 2018-03-21
Status: Merged
Merge reported by: Nish Aravamudan
Merged at revision: 4d51ced8a9fc72e8f1b9904c3f8728355b6cd739
Proposed branch: ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:bionic-uatools-fix-dep8-1757490
Merge into: ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
Diff against target: 27 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/tests/update-motd-run (+1/-1)
Reviewer Review Type Date Requested Status
Nish Aravamudan 2018-03-21 Approve on 2018-03-21
Canonical Server Core Reviewers 2018-03-21 Pending
Review via email: mp+341839@code.launchpad.net

Description of the change

Also rename the motd path in the corresponding dep8 test.

To post a comment you must log in.
Nish Aravamudan (nacc) :
review: Approve
Nish Aravamudan (nacc) wrote :

Upload tagged and sponsored.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9c328f7..bb95c3d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+ubuntu-advantage-tools (16) bionic; urgency=medium
7+
8+ * d/t/update-motd-run: fix path to the esm motd (LP: #1757490)
9+
10+ -- Andreas Hasenack <andreas@canonical.com> Wed, 21 Mar 2018 13:58:34 -0300
11+
12 ubuntu-advantage-tools (15) bionic; urgency=medium
13
14 * Rename motd scripts so they are shown a bit earlier (LP: #1757171)
15diff --git a/debian/tests/update-motd-run b/debian/tests/update-motd-run
16index c70fcf8..22b8010 100644
17--- a/debian/tests/update-motd-run
18+++ b/debian/tests/update-motd-run
19@@ -5,7 +5,7 @@ set -ex
20 # virgin system should not have esm enabled
21 codename=`lsb_release -cs`
22 description=`lsb_release -ds`
23-motd_text=`/bin/sh /etc/update-motd.d/99-esm`
24+motd_text=`/bin/sh /etc/update-motd.d/80-esm`
25
26 if [ "$codename" = "precise" ]; then
27 echo $motd_text | grep "This ${description} system is past"

Subscribers

People subscribed via source and target branches