From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A783A138334 for ; Fri, 19 Jul 2019 16:45:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133ADE0829; Fri, 19 Jul 2019 16:45:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC36CE0828 for ; Fri, 19 Jul 2019 16:45:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 079B93480F6 for ; Fri, 19 Jul 2019 16:45:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5B00715 for ; Fri, 19 Jul 2019 16:45:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1563554696.fa0bc77060e83768e5e5620fdf6ecbfd6546bd99.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/cantera/files/cantera_2.4.0_env.patch X-VCS-Directories: sci-libs/cantera/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fa0bc77060e83768e5e5620fdf6ecbfd6546bd99 X-VCS-Branch: master Date: Fri, 19 Jul 2019 16:45:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d085cd2f-4436-454b-9eee-6f38be715a24 X-Archives-Hash: cb0ffa622f774c2f1ce1490b9e0e6f9a commit: fa0bc77060e83768e5e5620fdf6ecbfd6546bd99 Author: band-a-prend yandex ru> AuthorDate: Wed Jul 17 15:03:27 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 19 16:44:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0bc770 sci-libs/cantera: 2.4.0-r1. Fix 'fatal' warning The SConstruct script contains block that tries to evaluate 'git rev-parse --short HEAD` comand and returns the "fatal: not a git repository (or any parent up to mount point /var/tmp)" warning from git command itself if git is installed in system. It occurs because the release package archive doesn't contain ".git" directory. This behaviour doesn't affect emerge process but can confuse in the case of other issues. Closes: https://bugs.gentoo.org/689998 Signed-off-by: Sergey Torokhov mail.ru> Signed-off-by: Michał Górny gentoo.org> sci-libs/cantera/files/cantera_2.4.0_env.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch index 1be40dfe044..bc018a53f89 100644 --- a/sci-libs/cantera/files/cantera_2.4.0_env.patch +++ b/sci-libs/cantera/files/cantera_2.4.0_env.patch @@ -10,7 +10,20 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct toolchain=toolchain, **extraEnvArgs) -@@ -1061,7 +1061,7 @@ +@@ -727,11 +727,8 @@ + env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version) + env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2]) + +-try: +- env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD') +-except Exception: +- env['git_commit'] = 'unknown' ++env['git_commit'] = 'unknown' + + # Print values of all build options: + print("Configuration variables read from 'cantera.conf' and command line:") + for line in open('cantera.conf'): +@@ -1062,7 +1062,7 @@ # Ignore the minor version, e.g. 2.4.x -> 2.4 env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])