[PATCH 1/2] Run substitution checks on the right kickstart file.
David Shea
dshea at redhat.com
Wed Sep 16 18:10:36 UTC 2015
On 09/16/2015 02:02 PM, Chris Lumens wrote:
> ${ks} is the input kickstart file, which is the .ks.in version.
> ${ksfile} is the one after prepare has been run, which might involve
> doing other modifications first. This only affects those few kickstart
> tests that do something complex in their prepare function.
> ---
> tests/kickstart_tests/scripts/run_one_ks.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/kickstart_tests/scripts/run_one_ks.sh b/tests/kickstart_tests/scripts/run_one_ks.sh
> index f0b43aa..9e86dfa 100755
> --- a/tests/kickstart_tests/scripts/run_one_ks.sh
> +++ b/tests/kickstart_tests/scripts/run_one_ks.sh
> @@ -80,7 +80,7 @@ runone() {
> # Check that the prepared kickstart is free of substitution markers. Normally
> # the substitutions are run by run_kickstart_tests.sh, but prepare has a chance
> # to run them too. If both of those left any @STUFF@ strings behind, fail.
> - unmatched="$(grep -o '@[^[:space:]]\+@' ${ks} | head -1)"
> + unmatched="$(grep -o '@[^[:space:]]\+@' ${ksfile} | head -1)"
> if [ -n "$unmatched" ]; then
> echo "RESULT:${name}:FAILED:Unsubstituted pattern ${unmatched}"
> cleanup ${tmpdir}
Ack to both, and thanks
More information about the anaconda-patches
mailing list