diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-10-08 22:43:44 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-10-08 23:05:33 +0200 |
| commit | 00c211a739abda0f6b36c21e99b0e030c6895b06 (patch) | |
| tree | 7df8faf713023b8bde0f1b49cbc0fc7cd88bff48 /__root__ | |
| parent | 1cd9d68fe1b41a2617d923742033865c58713ba7 (diff) | |
| download | clufter-00c211a739abda0f6b36c21e99b0e030c6895b06.tar.gz clufter-00c211a739abda0f6b36c21e99b0e030c6895b06.tar.xz clufter-00c211a739abda0f6b36c21e99b0e030c6895b06.zip | |
run-check: --dist goes prior alias cmd to influence it
This hasn't been considered before (hence the bug being fixed), and
it seems best if --dist in "global options" (prior to cmd spec) is the
only to influence command alias resolution, whereas --dist as "command
option" can influence some specifics for the command itself.
This way, natural causality on the command line is preserved.
Alternatively, we could look-ahead if there is dist defined as command
option and considered it in the alias resolution. But rather than
that, it would more bearable to remove --dist/--sys from command options
altogether but that would prevent injecting them when command-by-symlink
is exercised, so do not do this either.
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '__root__')
| -rwxr-xr-x | __root__/run-check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/__root__/run-check b/__root__/run-check index a8d764f..443aa8b 100755 --- a/__root__/run-check +++ b/__root__/run-check @@ -36,8 +36,8 @@ which ccs_flatten 2>/dev/null || ( run_check() { # self-check for sanity usage testcib="$(mktemp)" testcoro="$(mktemp)" - { { ${PYTHONEXEC} run-dev ccs2pcs --dist redhat,7.1,Maipo \ - "${@}" -- - - "${testcib}" \ + { { ${PYTHONEXEC} run-dev --dist redhat,7.1,Maipo \ + ccs2pcs "${@}" -- - - "${testcib}" \ | grep -Ev 'key: _NOT_SECRET--' > "${testcoro}"; } \ && echo "TEST: execution OK" \ || { echo "TEST: execution FAIL"; ret=20; }; }<<EOF @@ -170,8 +170,8 @@ EOF run_check_cmd() { # self-check for sanity usage testcmd="$(mktemp)" - { ${PYTHONEXEC} run-dev ccs2pcscmd --dist redhat,7.1,Maipo \ - "${@}" -sg -- - "${testcmd}" \ + { ${PYTHONEXEC} run-dev --dist redhat,7.1,Maipo \ + ccs2pcscmd "${@}" -sg -- - "${testcmd}" \ && echo "TEST: execution OK" \ || { echo "TEST: execution FAIL"; ret=20; }; }<<EOF <?xml version="1.0"?> |