From: Erik Winkels Date: Fri, 13 Feb 2026 11:37:32 +0000 (+0100) Subject: Undo some whitespace changes so diff looks good. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d46382acfa63188862062dcf52845bbffdbba46;p=thirdparty%2Fpdns.git Undo some whitespace changes so diff looks good. --- diff --git a/build-scripts/docker/repo-test/README.md b/build-scripts/docker/repo-test/README.md index 6ba90e1ea3..2519071173 100644 --- a/build-scripts/docker/repo-test/README.md +++ b/build-scripts/docker/repo-test/README.md @@ -71,7 +71,7 @@ an image and run a container using that image. ### `--run-output` This argument can be a little unclear. It is only applicable when -`--test` is also supplied and `--verbose` is *NOT* supplied, otherwise +`--test` is also supplied and `--verbose` is *NOT* supplied; otherwise, it is ignored. Since run output is not a lot when testing releases it can be nice to @@ -87,9 +87,9 @@ show the output from running the container even when `--verbose` is off - option to test a specific release version and not just the latest - maybe: - make error codes we get for building and running containers - readable if we can find a lib for this, otherwise it requires too + readable if we can find a lib for this; otherwise, it requires too much maintenance - - `errno` http://joeyh.name/code/moreutils/ + - `errno` https://joeyh.name/code/moreutils/ - parameter to test all the things! (this can currently easily done by a shell script / command) - `for RELEASE in auth-42 auth-43 auth-44 auth-master rec-42 rec-43 rec-44 rec-45 rec-master dnsdist-15 dnsdist-16 dnsdist-master; do ./generate-repo-files.py --test $RELEASE; done` diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py index 34d03a1c1b..8ddb4281d4 100755 --- a/build-scripts/docker/repo-test/generate-repo-files.py +++ b/build-scripts/docker/repo-test/generate-repo-files.py @@ -47,13 +47,11 @@ def init_argparser(): 'auth-48', 'auth-49', 'auth-50', 'auth-master', # Recursor - 'rec-48', 'rec-49', 'rec-50', 'rec-51', - 'rec-52', 'rec-53', 'rec-54', - 'rec-master', + 'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-52', 'rec-53', + 'rec-54', 'rec-master', # DNSDist - 'dnsdist-17', 'dnsdist-18', 'dnsdist-19', - 'dnsdist-20', 'dnsdist-21', - 'dnsdist-master'], + 'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-20', + 'dnsdist-21', 'dnsdist-master'], help='the release to generate Docker files for: ' + '%(choices)s') parser.add_argument('--run-output', action='store_true', @@ -102,11 +100,11 @@ def write_dockerfile (os, os_version, release): # > I prefer it to be in the code but I also do not want to add extra vars # > and logic to the code unless necessary. f.write(tpl.render({ "os": os, - "os_image": os_image, - "os_version": os_version, - "release": release, - "cmd": cmd, - "pkg": pkg })) + "os_image": os_image, + "os_version": os_version, + "release": release, + "cmd": cmd, + "pkg": pkg })) def write_list_file (os, os_version, release): @@ -114,8 +112,8 @@ def write_list_file (os, os_version, release): with open('pdns.list.{}.{}-{}'.format(release, os, os_version), 'w') as f: f.write(tpl.render({ "os": os, - "os_version": os_version, - "release": release })) + "os_version": os_version, + "release": release })) def write_pkg_pin_file (release): @@ -127,7 +125,7 @@ def write_pkg_pin_file (release): pkg = 'dnsdist' with open('pkg-pin', 'w') as f: - f.write(tpl.render({ "pkg": pkg })) + f.write(tpl.render({ "pkg": pkg })) def write_release_files (release):