Merge ~rbalint/ubuntu/+source/update-motd:ubuntu/master into ~ubuntu-core-dev/ubuntu/+source/update-motd:ubuntu/master

Proposed by Balint Reczey
Status: Merged
Merged at revision: 6ee98396995e95e20cc936e644ff0b359fca27d9
Proposed branch: ~rbalint/ubuntu/+source/update-motd:ubuntu/master
Merge into: ~ubuntu-core-dev/ubuntu/+source/update-motd:ubuntu/master
Diff against target: 37 lines (+0/-11)
2 files modified
debian/tests/control (+0/-2)
debian/tests/update-motd (+0/-9)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Iain Lane Pending
Review via email: mp+402913@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/tests/control b/debian/tests/control
2index fb91a63..20100e1 100644
3--- a/debian/tests/control
4+++ b/debian/tests/control
5@@ -1,7 +1,6 @@
6 Tests: show-motd
7 # mythtv-status is buggy
8 Depends: @,
9- apt-file,
10 base-files,
11 fortunes-ubuntu-server,
12 freedombox,
13@@ -16,7 +15,6 @@ Depends: @,
14 Tests: update-motd
15 # mythtv-status is buggy
16 Depends: @,
17- apt-file,
18 base-files,
19 fortunes-ubuntu-server,
20 freedombox,
21diff --git a/debian/tests/update-motd b/debian/tests/update-motd
22index d1001bb..fcd517d 100755
23--- a/debian/tests/update-motd
24+++ b/debian/tests/update-motd
25@@ -6,12 +6,3 @@ debian/tests/wait-for-apt-update-to-finish
26
27 # generate and show MOTD
28 update-motd
29-
30-# check if there are not tested snippets
31-# mythtv status is buggy
32-apt-file update
33-for i in $(apt-file search /etc/update-motd.d | grep -v mythtv-status | cut -d' ' -f2); do
34- if ! [ -f $i ]; then
35- echo "ERROR: Untested update-motd snippet: $(apt-file search $i): $i" >&2
36- fi
37-done

Subscribers

People subscribed via source and target branches