Skip to content

Commit 449fabd

Browse files
committed
Merge branch 'hg'
2 parents a4fc968 + ed5224f commit 449fabd

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

exception_lists/binary_files

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,10 @@
2626
syntax: regexp
2727
\.png$
2828
\.so(.\d)?$
29+
30+
# While the following are not binary files, they are not Unicode
31+
# encoded and thus might break some cdm checks.
32+
tests/ro_data/88591enc.copyright$
33+
tests/ro_data/badencoding.relnote$
34+
tests/ro_data/pkg.help.eucJP.expected.out$
35+
tests/ro_data/unsupported.copyright$

exception_lists/cddlchk

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,31 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2019, 2024, Oracle and/or its affiliates.
23+
# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
2424
#
25-
re:src/(?!(man/.*$|modules/choose\.py$|modules/cpiofile\.py$|modules/flavor/depthlimitedmf\.py$)|modules/solver/.*$|pkg/external_deps.*$|pkg/license_files/(?!lic_CDDL).*$|util/apache2/sysrepo/.*mako|util/apache22/sysrepo/.*.mako|tests/ro_data/.*|tests/bandit-baseline.json|tests/baseline-.*|po/LINGUAS|po/POTFILES.*).+
25+
26+
# Files matched below *should* include the CDDL block comment.
27+
28+
re:src/(?!modules/(choose\.py|cpiofile\.py|flavor/depthlimitedmf\.py)$).+\.py$
29+
re:src/(?!modules/solver/(solver\.c|solver\.h|vec\.h)$).+\.[ch]$
30+
2631
glob:*Makefile*
27-
glob:src/tests/*.py$
28-
glob:src/*\.py$
2932
glob:exception_lists/*
33+
glob:src/pkg/manifests/*
34+
glob:src/pkg/transforms/*
35+
glob:src/po/*\.po
36+
glob:src/scripts/*
37+
glob:src/svc/*
38+
glob:src/zoneproxy/*
3039
glob:tools/*
31-
src/tests/ro_data/signing_certs/generate_certs.py
40+
41+
re:src/util/(?!(apache2|misc)).+
42+
re:src/util/apache2/(?!(depot/depot_httpd_ssl_protocol.conf$|sysrepo)).+
43+
src/util/apache2/sysrepo/sysrepo_publisher_response.mako
44+
45+
re:src/web/(?!(robots.txt|_themes/(pkg-block-logo.svg|yui-reset-font-grids_base-min.css))$).+
46+
47+
src/pkg/ips-pkglintrc
48+
src/pkg/license_files/lic_CDDL
49+
src/tests/banditrc
50+
src/tests/pylintrc

0 commit comments

Comments
 (0)