From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6823398887937540096 X-Received: by 2002:a5d:6609:: with SMTP id n9mr4472750wru.32.1588696354849; Tue, 05 May 2020 09:32:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:11d0:: with SMTP id i16ls4080066wrx.10.gmail; Tue, 05 May 2020 09:32:34 -0700 (PDT) X-Google-Smtp-Source: APiQypJpViNCwzy8+9EAZSZazfLNoH00Xd1jQMm2DRi76X/GUu4zLg8mJRw9KV8MvZBBkQcmEeYR X-Received: by 2002:a5d:6503:: with SMTP id x3mr5078934wru.153.1588696353965; Tue, 05 May 2020 09:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588696353; cv=none; d=google.com; s=arc-20160816; b=ZeXSSZi26wbcHURzHkYAr0qccu0e1Ta2/FS6W1k5Ewo2ZZ6qXlCCdYj3FvufRIWw+6 OzlVD83k0qFeFXXvc2SJkwHWPMkkmjd6T7hNbLp0iaCuJF3BdOdFGAg4gV4TF3NsrWzB Qds8PbCjsrhS8gIiHuCtV0coN0JzbE/LR+hDLwztSIFtSF0bYMD82VpkqQFtBj9kxVl9 sfb/wHA6LSEvhLskE3eURRntIjIN3aEDRjFDdSq4Eue1UvVeRvSjgMTaZYJenecVe9YA gkEwAV9+PQFQBdyXF5qgU7Z+4OZqcWCv4R++X3ZdxO1h/PRDKQbT1Xb2FiaaohkAHteh SozA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=FUl47L+d3fbre5w5K1a51q7k6P/KX2wWggmCbrPBCaE=; b=k9pkB8t6nNT2Kuxw2miOSdIy4xD6a6+C46vYvNPM2BaTtOz1kpooEEh+H+bCoetxVV B8a6by04P/GZ9UFY4lbXlOAYdJ1lPGvsZ6KL2uOPB/ORT+OVxxXpYhfYI0qh4qbooTZj y8hWOyBZ8V+wr7q/abNpqmBFwUWu3GSweNzwo10CreWuQ9IFowAtOXySmq5OCiZTeuxk pVSBSuAdNoPMzoVn2dhac5R6zN0pDAIznb0hUBXB+vIjyxgpMvFsDNhq7eKevcpB1HMe Hzn1p0ttVa7O5x6YAgpn3ruUm060j8vPgpVY6qicdco9BbArE/OIZJwAPRSCh2WdMbnG CU5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id o136si143467wme.0.2020.05.05.09.32.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 May 2020 09:32:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 045GWX3P022451 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 5 May 2020 18:32:33 +0200 Received: from [167.87.53.26] ([167.87.53.26]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 045GWX2r018570 for ; Tue, 5 May 2020 18:32:33 +0200 From: Jan Kiszka Subject: [PATCH] image: Fix evaluation of complex ISAR_RELEASE_CMD values To: isar-users Message-ID: Date: Tue, 5 May 2020 18:32:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: rm8Xqhx+bRJc From: Jan Kiszka If ISAR_RELEASE_CMD contains a boolean expression make sure to evaluate it as a whole. So far, "false || true" was incorrectly be detected as unsuccessful. This allows to handle failing git version extractions gracefully, e.g. ISAR_RELEASE_CMD = "git ... describe ... || echo unknown". Signed-off-by: Jan Kiszka --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0150f271..a296cc06 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -99,7 +99,7 @@ get_build_id() { "considered in the build_id. Consider changing" \ "ISAR_RELEASE_CMD." fi - if ! ${ISAR_RELEASE_CMD} 2>/dev/null; then + if ! ( ${ISAR_RELEASE_CMD} ) 2>/dev/null; then bbwarn "\"${ISAR_RELEASE_CMD}\" failed, returning empty build_id." echo "" fi -- 2.26.1