From nobody Mon Sep 16 19:09:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=nutanix.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1721811414766195.1005698873886; Wed, 24 Jul 2024 01:56:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 89FAEC69; Wed, 24 Jul 2024 04:56:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2EF889BA; Wed, 24 Jul 2024 04:56:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A19899B8; Wed, 24 Jul 2024 04:56:34 -0400 (EDT) Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C59069B4 for ; Wed, 24 Jul 2024 04:56:33 -0400 (EDT) Received: from pps.filterd (m0127843.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46O0wqND019995 for ; Wed, 24 Jul 2024 01:56:33 -0700 Received: from bn8pr05cu002.outbound.protection.outlook.com (mail-eastus2azlp17011027.outbound.protection.outlook.com [40.93.12.27]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 40gbbffs8e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 24 Jul 2024 01:56:33 -0700 (PDT) Received: from CH2PR02MB6760.namprd02.prod.outlook.com (2603:10b6:610:7f::9) by BN0PR02MB8221.namprd02.prod.outlook.com (2603:10b6:408:153::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.20; Wed, 24 Jul 2024 08:56:30 +0000 Received: from CH2PR02MB6760.namprd02.prod.outlook.com ([fe80::fd77:ea65:a159:ef51]) by CH2PR02MB6760.namprd02.prod.outlook.com ([fe80::fd77:ea65:a159:ef51%4]) with mapi id 15.20.7784.017; Wed, 24 Jul 2024 08:56:30 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=proofpoint20171006; bh=QsomqIYEYdxrC K72KVMavYGQeZuC2EvmxKgmw6MaTDM=; b=KKbDjuRunCS1CpoRudwiKdeR5dFtX IJVsyFZrDNM6uFh3EQ0PP4jwdU6+DAuskLWFBTFbp7ousjyY0wkTNBdokLygL/aM y/Zn1POTTV+GvMKgR4YLiG/cU0YxiQYaKVcBjdAi4p/e3HyjqYJmeGq0ly6BzyHM w80fM1f03ptEPXv7kJ/UYgYvLo9hYaSNiBzEWjGBtf6Drt9d3jalmbMAQLg3s/Lh Oi/TQq7dAEWhF87ZyUS9YerCpLSBOIjcsRPkeqgJddOq/rb0NrKZcSJjhjsOTJ/U EUwj6fWRbNBhwFcijezUcpaw6ub1Dcz9O3fTSzUXLIAi4khGf/PQGdsDA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HfHNzYVdK/hvyn7YIAO9UxstK/eswfVw4GyOz4MsIUPe/MDk8jQulClxX+xjH/38acA4HHNAGwha1yfpkaPP7yiG1A7sWGM/WKmQ/jbqVgSiRnx8ejVXhpdZUrmO6wdJVGzw7IIqNHs7gWoPFvAtR4kwkFIpBQb+817c8flayDPFGqs7D3UYr05Qnptj4fErOk08zCg0ckMr4LIfp56vyLw38jaFf+/OyH1bdgUhngi3pSRPcxhXBJuWTS0sVFe/TeGBsEGd9weoM8JV0xcDKJaJBWm5MImdiFqhfnWxdPsmSrXiaVEV/JN9YPcjRV77poSXUVQ71AdB/eOQJ6l7BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QsomqIYEYdxrCK72KVMavYGQeZuC2EvmxKgmw6MaTDM=; b=aIrSSZh1jPVHskxNddzLSIBQlvXZt9dw7T9hjLesJk84Ro+WGlxVN+wRQZoV7uZm5hDKXptIXEVqpO4ThzGSkTQ7DdIyVhKxWNV0s5T3SfG3ts/z6kkrDGtU0S+rYeub4ZssBO6r6qxeNjcZRziAiN1mpHvFH5i5w7Jo1pA/oqs7VYFD0i345xHa6itbq9R6xmVBLsMf9S3bTauCK7tmHvCuMLb1GJAaR3K8XDh8e5u8HDhEtWsup1raWOtMWab1296R82ISU2FjzRCNElqnkyooj96JsbtEBnpc7Y1bFh4LX1qLd5a77AEzbJDTJ5OFsGSZOe1FeeYD6aj4vr+QyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QsomqIYEYdxrCK72KVMavYGQeZuC2EvmxKgmw6MaTDM=; b=evrG2tx/PAsk82ccxALdMSqWcZcSx39japYIEFODqcl77eBQ3hv2kGu+FytLv2kVD0eWofYg6HmTOuJIAjGcsI8NcRMVJ8PUh1q7jGtJpOGNeiVcuCoe335Xz3ITOU7EVZuBFWy1ZwjIpyOeXPL+OaEU1JABC2xvx6RYYCYxcddpshjT3TwRNFhLVbbaT2Rcbvt5DVlPG559w8nCt0GrZKe3vei3xAFjyveuPFefE8lwQiG9y18Z0ioIQR/3vfmkY6GHlK1JYzcomXkwpcYXsMC/8bLrL1DRF1Cx2QIbuhQjw2kBktmI/Aw+h/JaHvjFAqpLT81JPQ7IH7hhqZxS4g== From: John Levon To: devel@lists.libvirt.org Subject: [PATCH] meson: correct git detection Date: Wed, 24 Jul 2024 09:56:04 +0100 Message-Id: <20240724085603.2149977-1-john.levon@nutanix.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: AM0P190CA0028.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::38) To CH2PR02MB6760.namprd02.prod.outlook.com (2603:10b6:610:7f::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR02MB6760:EE_|BN0PR02MB8221:EE_ X-MS-Office365-Filtering-Correlation-Id: f4e61d5e-dfbe-4d29-49c0-08dcabbe824d x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KbEoOgj1dm54m1l0cafhOksXD1yQh5XpVx9yzxLQPU+PIFY1yNH8tmmEg5Yn?= =?us-ascii?Q?BSy900We27cGMY2fK5vQ2FjdTwkiMRZdeDdNqSNldU6AsUQIY5voWFIzRHeZ?= =?us-ascii?Q?koqmgaR/DulN1v9Pfgr8+3hsRtx8vo4y8Eb+nYyNfvtbN9fyhYGWhevHgRXA?= =?us-ascii?Q?RqrNXSah9PoZsZ7Zu7XFOJPjWe/RcU8Y8F0zUjtQhm48IT04iUy1GuLz4Zj0?= =?us-ascii?Q?hLCw2iL4QAGniCPM7pTgKEPBmN0tihsvq1sWJ0CwXHyHEkPnHANvlfodPgT4?= =?us-ascii?Q?Y1b29MRTcCWaCnebu7ELLYnf7a1yw1HTi1iK4WvNdAUVmgXUUpGtCIhnXHVr?= =?us-ascii?Q?ZBKC1ibjMr6m+xfmMbNSXWhkhyAMJwClF5IoGD6HjogNIO7/L+aC3ApnPhI6?= =?us-ascii?Q?IfvYOagNZG8ZlXyrWIS8+LBQU+Gh0Si9n2csWM11Zfd9omYLaSBdUryYYNXl?= =?us-ascii?Q?nogB+5QUoCSQ3wABDnq3wCv4PJ7+AflpuMLTAbV827uPIVwVnSdCDnyw2hZM?= =?us-ascii?Q?55CNdccvdy1ocj6yNPzaaKPER0P/wbZRDbOLtrincbXfdP6LV6Tm8zzxSD33?= =?us-ascii?Q?jOkY7rYDA8bDILHw+s34ZtgdMvZQd70UxksLh8MMSoyUwfzcRJqZYnY5Q0Ke?= =?us-ascii?Q?1Kn2WlWPpROscFqlgVnFEKyege/EneIQtlbido9c/Dg18Re9MuE7PYPl4F7V?= =?us-ascii?Q?11uF5x9dsaDQsbGn9qdO7/GCRE/uP4qStpWXziP4ewkbAeiyVRY3R90qq2+n?= =?us-ascii?Q?Lx7Vj6utZrSOsrTybMTHSyuXFNvU6bdgtw2lTA5pfor/Dmr9BkjbnVhS3aiI?= =?us-ascii?Q?GdXKQqOmyODcv0rZ5EDdiwkYCZNCBWOn0ZUNRF36ckRj5UZOHOsBD0+oRY+i?= =?us-ascii?Q?86VcarzOmpyHLp/zkqPm4+nkDDTO+U/+Rut2Jt2JR56elmqTgTPADU87VdOL?= =?us-ascii?Q?dSHhDT7oobjwEOE6prTMpbpQ89NzE3D8ujAHxA78gPOF5Dz4ng7fNuNSZXhr?= =?us-ascii?Q?czXWXOKhiLJCE0uKAb4G/p+bsWyj3KL7QhhP4IjpnI3ploGWhRr8qMNCODh/?= =?us-ascii?Q?324cDpeNdpAQBR2LRkpRs1Nrp8i9gyeCUqNsHVRXGzeSTk+NNLSDAXhqC2Z0?= =?us-ascii?Q?TV4P+LKE+i8+37jJSxwpA1uwBMs5Gb5NOGUzwYa6/Kt/sXPeLlk3Dp+itBQg?= =?us-ascii?Q?3g7LaLYv+6XZPdsqhVbJFGsGf6NlNDOdpnRt+3tik6Qc0pIlliq9MGTdRTCA?= =?us-ascii?Q?YMbNJQ1sWemb3W9rmZ2vGd7oj4DwpftXvSpYTmIidTvARGwKle7TINitw0BZ?= =?us-ascii?Q?t8xmOc7YazOT+IGlb8q0KisgZ6miZ/07epGsJ1kV1EDs/w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR02MB6760.namprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jjW7n6p65PUugLr3MvC6NALeeXrQ6y4UF5zADzFfhFCBxLdvDJcQFMzYtrFD?= =?us-ascii?Q?+ESI+EDiE/v3hH2dnxSvDHfRb5ztIjOM40IL7A3iCfnGlTMbUtPvvtHJ5e9s?= =?us-ascii?Q?PMOanA7Chz1ZXA14b73hSCnVpmC9UEjfSFfet79locFXNJE86zD3wPEciHOK?= =?us-ascii?Q?jAR/9Mf+Aj3R0jXiimUmoAN004yna1OhGYIkP+wAlmFnxFjKTbukuxMM63Xd?= =?us-ascii?Q?mwVVMNjqPltqN138QbqsP0PjdwfoOQQahsltUqOFvuuDlwu6s//RYjMT5Eag?= =?us-ascii?Q?NeYF9qZ73Negobh1nHq4R+jkdxKWogj/daAnCOyD/9DhG8/8UlJ9I66T5RHD?= =?us-ascii?Q?5tIB74tASvcxp8hK0rHECLOsBuHkbgkQEquZnXq9tKUVKEXXU3xU/x2E/GLQ?= =?us-ascii?Q?j76kiz9/aYWa7AYHBaJwAD2JNc4ZzAgGHt6mRFYE81dABB/+Gb7DyXVrCmaD?= =?us-ascii?Q?+2ArnVd+JoQcpPXim+dhdu86lCDbxGHPOJeOVnPfD3aJ4CJ4mMXOwZ+boiQf?= =?us-ascii?Q?3SzfhsqS9IjrxbqdHlqUQy8icD8qMJ+hBxTdKEKiIDVFMzZzrwcJD0JOUurW?= =?us-ascii?Q?WNCPmbfyHhRzKYuxR01ebOdGU8kCdIVa9eC8oHCpPuhKgC9l7xCMSFVX8OSY?= =?us-ascii?Q?L59XKYYT/ahN9JLZcKRfx56mptViZbShv4/HfbIx6r9MxVeKYiAJc61UOUid?= =?us-ascii?Q?M9J2W87ZgVy3Tuu5rPBMODJHFV/aU7KKrU6PmSOvgg5JISBCdrUuLAdjih8M?= =?us-ascii?Q?36XvfqGckIoi210akoyuypswuzS3ndUC/lFTwfhvgrK4mW5A+WvWmtzfG99A?= =?us-ascii?Q?eJN/pAA3KoOuyiJZijFRBxSLx8sVn3XlpyyVVQy4lNEV09E231ixxRJ1pOIY?= =?us-ascii?Q?WvZWOcAfpNpAlxBkgacdb+XOvdMS5648SSvXDC/37suax68BWel9Bq0o/haR?= =?us-ascii?Q?LNCdjJx8qjgALLlW1qPAGuCjgHYFnF1n4pfDd2h1PtfagpASmHZF0MUC8uIZ?= =?us-ascii?Q?CXDytFHcNod1YNguoXREGR+OOP5SOYtqOtXhLUk43LvZSQwZMFe3Cn1mCmLc?= =?us-ascii?Q?JHXJZpXGcUupf0qgmM4unL0HkrqrF53Q061IlTbQ4lT6W3Q5qoZ3gdxtfjZ5?= =?us-ascii?Q?kx/EZOQBPXPdLqtGELXvIh/5cawHoLvhFg+KHtsCPdHaaGfJJNJG0jOb5BWw?= =?us-ascii?Q?l04FbTMgDJIwvqS+Y84ebVqIgdXnQaSOQS+X23HTWd47SaSoAA6GTspoNQj2?= =?us-ascii?Q?+tsu/idaiNgEkOie70MmcZTiyd9uQSx/oHYmYf6swtpgKMjHpIBR+Vtsfrw4?= =?us-ascii?Q?2O7MosXpyDYVoI8+Ra9aGgb7uplekFMGZS3p0dhrHES8PvdSn9DKs0s41+n5?= =?us-ascii?Q?89j/l7XuR5uFceaJQ2061nWzrql2KvQ7tsZKanA8rNuNSUvkKokDInBInzNQ?= =?us-ascii?Q?eFhLX1Nio5HeEUsGNd9NFNhfdXi81z+0riSUEUBW9h6poE5pYIF5FIvW4r3G?= =?us-ascii?Q?QihBjneIF7T1shqbw7LPnTjIvR4Qu00BhM5W/zyOZB8wVWFKtyysEdAir6+a?= =?us-ascii?Q?zEamyBCvMa9asdmX6bOpkSna09H4jNHCX4z0lWlv?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4e61d5e-dfbe-4d29-49c0-08dcabbe824d X-MS-Exchange-CrossTenant-AuthSource: CH2PR02MB6760.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2024 08:56:30.0519 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oUZDo0GsueUjY69RyJqeWUdpI8hx1LLOrusEeqG3hunNP5IKejvIkvrn2smfXzaAQ4+uPaL0fyEixB5p+VThuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8221 X-Proofpoint-GUID: hO0cNiEpGnRQ8oKML1Rc6JgO4B5d4NH7 X-Proofpoint-ORIG-GUID: hO0cNiEpGnRQ8oKML1Rc6JgO4B5d4NH7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-24_06,2024-07-23_02,2024-05-17_01 X-Proofpoint-Spam-Reason: safe Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PCUSWYFAPHPGEASHP25HVVNPJOPUE2P3 X-Message-ID-Hash: PCUSWYFAPHPGEASHP25HVVNPJOPUE2P3 X-MailFrom: john.levon@nutanix.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: John Levon X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZM-MESSAGEID: 1721811416289116600 Content-Type: text/plain; charset="utf-8" The current "building from git" test uses "test -d .git"; however, that doesn't work when libvirt is used as a submodule, as in that case .git is a normal file. Use "test -e .git" instead. Signed-off-by: John Levon Reviewed-by: Michal Privoznik --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3ab8e57e4a..231470e2ee 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,7 @@ endif =20 # figure out if we are building from git =20 -git =3D run_command('test', '-d', '.git', check: false).returncode() =3D= =3D 0 +git =3D run_command('test', '-e', '.git', check: false).returncode() =3D= =3D 0 =20 if git and not get_option('no_git') run_command('git', 'submodule', 'update', '--init', check: true) --=20 2.34.1