On (29/09/15 15:47), Nikolai Kondrashov wrote:
On 09/29/2015 03:35 PM, Lukas Slebodnik wrote:
ehlo,
attached is a simple patchwhich allows to run CI cript on CentOS. It worked just with a RHEL.
LS
0001-CI-Fix-configure-script-arguments-for-CentOS.patch
From 04d67362c5b2ff19a828d8f69d3cb2fb978bba95 Mon Sep 17 00:00:00 2001 From: Lukas Slebodniklslebodn@redhat.com Date: Tue, 29 Sep 2015 12:04:31 +0200 Subject: [PATCH 1/4] CI: Fix configure script arguments for CentOS
Resolves: https://fedorahosted.org/sssd/ticket/2807
contrib/ci/configure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index d68f331913325463b698411efa61c2522f055ccf..fe37820bd99aba2d1f5bede9bc7e68fd601a53ab 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -31,7 +31,8 @@ declare -a CONFIGURE_ARG_LIST=( )
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*-
|| "$DISTRO_BRANCH" == -redhat-centos-6.*- ]]; then@@ -39,7 +40,8 @@ if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then ) fi
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*-
|| "$DISTRO_BRANCH" == -redhat-centos-7.*- ]]; then-- 2.5.0
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
LS