From bbb9acf310017d21246c620ebd61a3dfd47e6630 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Sat, 5 Sep 2020 18:13:01 +0200 Subject: [PATCH] run-kojid: conditionally exec add-host-to-channel Only execute add-host-to-channel if add-host was successful. The former throws exceptions. --- container/builder/run-kojid.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/container/builder/run-kojid.sh b/container/builder/run-kojid.sh index 05c98df..e3f634f 100755 --- a/container/builder/run-kojid.sh +++ b/container/builder/run-kojid.sh @@ -1,16 +1,12 @@ #!/bin/bash -set -eux +set -ux -koji --server=http://org.osbuild.koji.koji/kojihub \ - --user=kojiadmin \ - --password=kojipass \ - --authtype=password \ - add-host org.osbuild.koji.kojid i386 x86_64 || true +KOJI="koji --server=http://org.osbuild.koji.koji/kojihub --user=kojiadmin --password=kojipass --authtype=password" -koji --server=http://org.osbuild.koji.koji/kojihub \ - --user=kojiadmin \ - --password=kojipass \ - --authtype=password \ - add-host-to-channel org.osbuild.koji.kojid image || true +$KOJI add-host org.osbuild.koji.kojid i386 x86_64 + +if [ $? -eq 0 ]; then + $KOJI add-host-to-channel org.osbuild.koji.kojid image +fi /usr/sbin/kojid -d -v -f --force-lock || cat /var/log/kojid.log