Skip to content

Commit 1044944

Browse files
Rafid Bin Mostofacjdcordeiro
authored andcommitted
refactor: fix linting issues
This commit fixes the linting failures of yamllint and the custom bash script which checks whether 'essential' and 'contents' are sorted or not in a slice definition.
1 parent 12660bd commit 1044944

31 files changed

Lines changed: 156 additions & 149 deletions

slices/base-files.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package: base-files
33
slices:
44
base:
55
essential:
6-
- base-files_etc
76
- base-files_bin
7+
- base-files_etc
8+
- base-files_home
89
- base-files_lib
910
- base-files_tmp
1011
- base-files_var
11-
- base-files_home
1212

1313
etc:
1414
contents:
@@ -52,8 +52,8 @@ slices:
5252
contents:
5353
/etc/debian_version:
5454
/etc/dpkg/origins/debian:
55-
/etc/dpkg/origins/ubuntu:
5655
/etc/dpkg/origins/default: {symlink: /etc/dpkg/origins/ubuntu}
56+
/etc/dpkg/origins/ubuntu:
5757
/etc/host.conf:
5858
/etc/issue:
5959
/etc/issue.net:

slices/base-passwd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package: base-passwd
33
slices:
44
data:
55
contents:
6-
/usr/share/base-passwd/group.master: {until: mutate}
7-
/usr/share/base-passwd/passwd.master: {until: mutate}
8-
/etc/group: {text: FIXME, mutable: true}
6+
/etc/group: {text: FIXME, mutable: true}
97
/etc/passwd: {text: FIXME, mutable: true}
8+
/usr/share/base-passwd/group.master: {until: mutate}
9+
/usr/share/base-passwd/passwd.master: {until: mutate}
1010
mutate: |
1111
gr = content.read("/usr/share/base-passwd/group.master")
1212
content.write("/etc/group", gr)

slices/bash.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ slices:
1717
# user should manually link /bin/sh to /bin/bash
1818
/bin/bash:
1919
/bin/rbash:
20-
/usr/bin/clear_console:
2120
/usr/bin/bashbug:
21+
/usr/bin/clear_console:

slices/ca-certificates-java.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ slices:
88
contents:
99
/etc/default/cacerts:
1010
/etc/ssl/certs/java/:
11-
12-
# we need to run `keytool` in postinst, but we can't yet do
13-
# this from a mutation script
11+
# we need to run `keytool` in postinst, but we can't yet do
12+
# this from a mutation script

slices/ca-certificates.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ slices:
88
/usr/share/ca-certificates/mozilla/*: {until: mutate}
99
mutate: |
1010
certs_dir = "/usr/share/ca-certificates/mozilla/"
11-
certs = [content.read(certs_dir + path) for path in content.list(certs_dir)]
11+
certs = [
12+
content.read(certs_dir + path) for path in content.list(certs_dir)
13+
]
1214
content.write("/etc/ssl/certs/ca-certificates.crt", "".join(certs))

slices/curl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slices:
44
bins:
55
essential:
66
- libc6_libs
7-
- libcurl4_libs
7+
- libcurl4_libs
88
- zlib1g_libs
99
contents:
1010
/usr/bin/curl:

slices/dotnet-hostfxr-6.0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package: dotnet-hostfxr-6.0
22
slices:
33
libs:
44
essential:
5+
- dotnet-host_bins
56
- libc6_libs
67
- libgcc-s1_libs
78
- libstdc++6_libs
8-
- dotnet-host_bins
99
contents:
1010
/usr/lib/dotnet/host/fxr/*/libhostfxr.so:

slices/findutils.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slices:
44
bins:
55
essential:
66
- libc6_libs
7-
- libselinux1_libs
7+
- libselinux1_libs
88
contents:
99
/usr/bin/find:
1010
/usr/bin/xargs:

slices/fonts-dejavu-core.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ slices:
99
/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf:
1010
/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf:
1111
/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf:
12-
12+
1313
config:
1414
contents:
1515
/etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf:

slices/libasan6.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ slices:
44
libs:
55
essential:
66
- libc6_libs
7-
- libstdc++6_libs
87
- libgcc-s1_libs
9-
# Although gcc-11-base is a package dependency, it is not needed for this libs slice and is thus omitted.
8+
- libstdc++6_libs
9+
# Although gcc-11-base is a package dependency, it is not needed for this
10+
# libs slice and is thus omitted.
1011
contents:
1112
/usr/lib/*-linux-*/libasan.so.6*:

0 commit comments

Comments
 (0)