UTAH

Merge utah:file_list_cleanup into utah:master

  1. Git
  2. lp:utah
  3. file_list_cleanup
  4. Merge into master
Proposed by Jean-Baptiste Lallement
Status: Merged
Approved by: Paride Legovini
Approved revision: c78b95656a1faa19c49b68af6d844ad0a5e124b8
Merged at revision: c78b95656a1faa19c49b68af6d844ad0a5e124b8
Proposed branch: utah:file_list_cleanup
Merge into: utah:master
Diff against target: 254 lines (+0/-39)
15 files modified
utah/isotest/data/file_list_di (+0/-2)
utah/isotest/data/file_list_di_powerpc (+0/-12)
utah/isotest/data/file_list_di_s390x (+0/-2)
utah/isotest/data/file_list_subiquity (+0/-2)
utah/isotest/data/file_list_subiquity.bionic (+0/-2)
utah/isotest/data/file_list_subiquity.focal (+0/-2)
utah/isotest/data/file_list_subiquity.groovy (+0/-2)
utah/isotest/data/file_list_subiquity_arm64 (+0/-2)
utah/isotest/data/file_list_subiquity_powerpc (+0/-1)
utah/isotest/data/file_list_subiquity_s390x (+0/-2)
utah/isotest/data/file_list_ubiquity (+0/-2)
utah/isotest/data/file_list_ubiquity.bionic (+0/-2)
utah/isotest/data/file_list_ubiquity.focal (+0/-2)
utah/isotest/data/file_list_ubiquity.groovy (+0/-2)
utah/isotest/data/file_list_ubiquity_dvd (+0/-2)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Review via email: mp+396301@code.launchpad.net

Commit message

Following the cleanup in debian-cd (https://bazaar.launchpad.net/~ubuntu-cdimage/debian-cd/ubuntu/revision/2102) update the files list used for static validation accordingly.

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

Verified that all the occurrences of README.diskdefines and pics have been removed from all the file lists. LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/utah/isotest/data/file_list_di b/utah/isotest/data/file_list_di
2index cc707c1..752e4ea 100644
3--- a/utah/isotest/data/file_list_di
4+++ b/utah/isotest/data/file_list_di
5@@ -41,8 +41,6 @@ install/sbm.bin
6 install/vmlinu
7 isolinux
8 md5sum.txt
9-pics
10 pool
11 preseed
12-README.diskdefines
13 ubuntu
14diff --git a/utah/isotest/data/file_list_di_powerpc b/utah/isotest/data/file_list_di_powerpc
15index ff0df2f..637270c 100644
16--- a/utah/isotest/data/file_list_di_powerpc
17+++ b/utah/isotest/data/file_list_di_powerpc
18@@ -1,5 +1,4 @@
19 .
20-pics
21 ppc
22 ppc/chrp
23 doc
24@@ -10,18 +9,7 @@ doc/install/manual/en/images
25 preseed
26 .disk
27 install
28-README.diskdefines
29 md5sum.txt
30-pics/blue-lowerleft.png
31-pics/blue-lowerright.png
32-pics/blue-upperleft.png
33-pics/blue-upperright.png
34-pics/debian.jpg
35-pics/logo-50.jpg
36-pics/red-lowerleft.png
37-pics/red-lowerright.png
38-pics/red-upperleft.png
39-pics/red-upperright.png
40 ppc/bootinfo.txt
41 doc/install/manual/example-preseed.txt.gz
42 doc/install/manual/en/apa.html
43diff --git a/utah/isotest/data/file_list_di_s390x b/utah/isotest/data/file_list_di_s390x
44index 9fec649..a728d82 100644
45--- a/utah/isotest/data/file_list_di_s390x
46+++ b/utah/isotest/data/file_list_di_s390x
47@@ -1,5 +1,4 @@
48 .disk
49-README.diskdefines
50 boot
51 boot/initrd.off
52 boot/initrd.siz
53@@ -16,7 +15,6 @@ install/filesystem.size
54 install/filesystem.squashfs
55 install/filesystem.squashfs.gpg
56 md5sum.txt
57-pics
58 pool
59 preseed
60 ubuntu
61diff --git a/utah/isotest/data/file_list_subiquity b/utah/isotest/data/file_list_subiquity
62index 83f40ad..b5b9ebb 100644
63--- a/utah/isotest/data/file_list_subiquity
64+++ b/utah/isotest/data/file_list_subiquity
65@@ -1,6 +1,5 @@
66 .disk
67 .disk/info
68-README.diskdefines
69 boot
70 boot/grub
71 casper
72@@ -12,6 +11,5 @@ casper/vmlinuz
73 dists
74 install
75 md5sum.txt
76-pics
77 pool
78 ubuntu
79diff --git a/utah/isotest/data/file_list_subiquity.bionic b/utah/isotest/data/file_list_subiquity.bionic
80index 4b31d28..97cafa7 100644
81--- a/utah/isotest/data/file_list_subiquity.bionic
82+++ b/utah/isotest/data/file_list_subiquity.bionic
83@@ -4,7 +4,6 @@ EFI
84 EFI/BOOT
85 EFI/BOOT/BOOTx64.EFI
86 EFI/BOOT/grubx64.efi
87-README.diskdefines
88 boot
89 boot/grub
90 casper
91@@ -17,6 +16,5 @@ dists
92 install
93 isolinux
94 md5sum.txt
95-pics
96 pool
97 ubuntu
98diff --git a/utah/isotest/data/file_list_subiquity.focal b/utah/isotest/data/file_list_subiquity.focal
99index 4b31d28..97cafa7 100644
100--- a/utah/isotest/data/file_list_subiquity.focal
101+++ b/utah/isotest/data/file_list_subiquity.focal
102@@ -4,7 +4,6 @@ EFI
103 EFI/BOOT
104 EFI/BOOT/BOOTx64.EFI
105 EFI/BOOT/grubx64.efi
106-README.diskdefines
107 boot
108 boot/grub
109 casper
110@@ -17,6 +16,5 @@ dists
111 install
112 isolinux
113 md5sum.txt
114-pics
115 pool
116 ubuntu
117diff --git a/utah/isotest/data/file_list_subiquity.groovy b/utah/isotest/data/file_list_subiquity.groovy
118index 43f9991..7c8bb25 100644
119--- a/utah/isotest/data/file_list_subiquity.groovy
120+++ b/utah/isotest/data/file_list_subiquity.groovy
121@@ -4,7 +4,6 @@ EFI
122 EFI/boot
123 EFI/boot/bootx64.efi
124 EFI/boot/grubx64.efi
125-README.diskdefines
126 boot
127 boot/grub
128 casper
129@@ -16,6 +15,5 @@ casper/vmlinuz
130 dists
131 install
132 md5sum.txt
133-pics
134 pool
135 ubuntu
136diff --git a/utah/isotest/data/file_list_subiquity_arm64 b/utah/isotest/data/file_list_subiquity_arm64
137index efd4f2a..d715807 100644
138--- a/utah/isotest/data/file_list_subiquity_arm64
139+++ b/utah/isotest/data/file_list_subiquity_arm64
140@@ -1,11 +1,9 @@
141 .disk
142-README.diskdefines
143 boot
144 boot/grub/arm64-efi
145 casper/vmlinuz
146 dists
147 install
148 md5sum.txt
149-pics
150 pool
151 ubuntu
152diff --git a/utah/isotest/data/file_list_subiquity_powerpc b/utah/isotest/data/file_list_subiquity_powerpc
153index 92183e1..ba4ffb5 100644
154--- a/utah/isotest/data/file_list_subiquity_powerpc
155+++ b/utah/isotest/data/file_list_subiquity_powerpc
156@@ -1,6 +1,5 @@
157 .disk
158 .disk/info
159-README.diskdefines
160 boot
161 boot/grub
162 casper
163diff --git a/utah/isotest/data/file_list_subiquity_s390x b/utah/isotest/data/file_list_subiquity_s390x
164index 656d9c8..b49a328 100644
165--- a/utah/isotest/data/file_list_subiquity_s390x
166+++ b/utah/isotest/data/file_list_subiquity_s390x
167@@ -1,5 +1,4 @@
168 .disk
169-README.diskdefines
170 boot
171 boot/initrd.off
172 boot/initrd.siz
173@@ -11,6 +10,5 @@ boot/ubuntu.ins
174 dists
175 install
176 md5sum.txt
177-pics
178 pool
179 ubuntu
180diff --git a/utah/isotest/data/file_list_ubiquity b/utah/isotest/data/file_list_ubiquity
181index 64c12ea..ff53f8b 100644
182--- a/utah/isotest/data/file_list_ubiquity
183+++ b/utah/isotest/data/file_list_ubiquity
184@@ -5,10 +5,8 @@ dists
185 install
186 isolinux
187 md5sum.txt
188-pics
189 pool
190 preseed
191-README.diskdefines
192 ubuntu
193 casper
194 casper/filesystem.squashfs
195diff --git a/utah/isotest/data/file_list_ubiquity.bionic b/utah/isotest/data/file_list_ubiquity.bionic
196index 64c12ea..ff53f8b 100644
197--- a/utah/isotest/data/file_list_ubiquity.bionic
198+++ b/utah/isotest/data/file_list_ubiquity.bionic
199@@ -5,10 +5,8 @@ dists
200 install
201 isolinux
202 md5sum.txt
203-pics
204 pool
205 preseed
206-README.diskdefines
207 ubuntu
208 casper
209 casper/filesystem.squashfs
210diff --git a/utah/isotest/data/file_list_ubiquity.focal b/utah/isotest/data/file_list_ubiquity.focal
211index 64c12ea..ff53f8b 100644
212--- a/utah/isotest/data/file_list_ubiquity.focal
213+++ b/utah/isotest/data/file_list_ubiquity.focal
214@@ -5,10 +5,8 @@ dists
215 install
216 isolinux
217 md5sum.txt
218-pics
219 pool
220 preseed
221-README.diskdefines
222 ubuntu
223 casper
224 casper/filesystem.squashfs
225diff --git a/utah/isotest/data/file_list_ubiquity.groovy b/utah/isotest/data/file_list_ubiquity.groovy
226index f7c6306..a13f8fc 100644
227--- a/utah/isotest/data/file_list_ubiquity.groovy
228+++ b/utah/isotest/data/file_list_ubiquity.groovy
229@@ -4,10 +4,8 @@ casper
230 dists
231 install
232 md5sum.txt
233-pics
234 pool
235 preseed
236-README.diskdefines
237 ubuntu
238 casper
239 casper/filesystem.squashfs
240diff --git a/utah/isotest/data/file_list_ubiquity_dvd b/utah/isotest/data/file_list_ubiquity_dvd
241index 893fe6c..df7b681 100644
242--- a/utah/isotest/data/file_list_ubiquity_dvd
243+++ b/utah/isotest/data/file_list_ubiquity_dvd
244@@ -5,10 +5,8 @@
245 ./install
246 ./isolinux
247 ./md5sum.txt
248-./pics
249 ./pool
250 ./preseed
251-./README.diskdefines
252 ./ubuntu
253 /casper
254 /casper/filesystem.squashfs

Subscribers

People subscribed via source and target branches

to all changes: