From patchwork Tue Oct 6 14:28:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 11818737 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68761139A for ; Tue, 6 Oct 2020 14:29:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58860206DD for ; Tue, 6 Oct 2020 14:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726013AbgJFO3S (ORCPT ); Tue, 6 Oct 2020 10:29:18 -0400 Received: from mx2.suse.de ([195.135.220.15]:33460 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725906AbgJFO3S (ORCPT ); Tue, 6 Oct 2020 10:29:18 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 68770B297; Tue, 6 Oct 2020 14:29:16 +0000 (UTC) From: Petr Vorel To: linux-integrity@vger.kernel.org Cc: Petr Vorel , Mimi Zohar Subject: [PATCH 1/1] travis: Fix Tumbleweed installation Date: Tue, 6 Oct 2020 16:28:23 +0200 Message-Id: <20201006142824.12152-1-pvorel@suse.cz> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org to prevent fail the job when /usr/lib/ibmtss/tpm_server does not exist. Fixes: 6c78911 travis: Switch to docker based builds Signed-off-by: Petr Vorel --- Hi, fixed: https://travis-ci.org/github/pevik/ima-evm-utils/jobs/733339306 broken: https://travis-ci.org/github/pevik/ima-evm-utils/jobs/733310157 Sorry for not catching obvious error when using 'set -e'. Kind regards, Petr travis/tumbleweed.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/travis/tumbleweed.sh b/travis/tumbleweed.sh index ec4dc43..ecd2372 100755 --- a/travis/tumbleweed.sh +++ b/travis/tumbleweed.sh @@ -42,4 +42,6 @@ zypper --non-interactive install --force-resolution --no-recommends \ which \ xsltproc -[ -f /usr/lib/ibmtss/tpm_server ] && ln -s /usr/lib/ibmtss/tpm_server /usr/local/bin +if [ -f /usr/lib/ibmtss/tpm_server ]; then + ln -s /usr/lib/ibmtss/tpm_server /usr/local/bin +fi