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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93AB5158089 for ; Sat, 16 Sep 2023 13:48:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C43582BC01C; Sat, 16 Sep 2023 13:48:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9D012BC01C for ; Sat, 16 Sep 2023 13:48:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E581A335D21 for ; Sat, 16 Sep 2023 13:48:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 652421148 for ; Sat, 16 Sep 2023 13:48:12 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1694872026.3fedadeb966a056885518a29e3894a313c558dcb.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3fedadeb966a056885518a29e3894a313c558dcb X-VCS-Branch: master Date: Sat, 16 Sep 2023 13:48:12 +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: 0a62035a-31f1-4c4f-b387-bad25752872d X-Archives-Hash: 2bafe44ac92dca456b4edf536fbc60bf commit: 3fedadeb966a056885518a29e3894a313c558dcb Author: Fabian Groffen gentoo org> AuthorDate: Sat Sep 16 13:47:06 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Sep 16 13:47:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3fedadeb scripts/bootstrap-prefix: prefer ID over NAME when guessing platform ID is typically something like "debian", NAME "Debian GNU/Linux". We want the former. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 21b012bf1d..e6a88b8325 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -3138,8 +3138,8 @@ if [[ ${CHOST} == *-linux-* ]] ; then rel=$(lsb_release -sr) if [[ -z ${dist} ]] || [[ -z ${rel} ]] ; then source /etc/os-release # this may fail if the file isn't there - [[ -z ${dist} ]] && dist=${NAME} [[ -z ${dist} ]] && dist=${ID} + [[ -z ${dist} ]] && dist=${NAME} [[ -z ${rel} ]] && rel=${VERSION_ID} fi