From nobody Fri Apr 26 05:38:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+64860+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64860+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1598902083; cv=none; d=zohomail.com; s=zohoarc; b=k9LmhH+kA+SgRKoyhkUn+GL1EnsVSK8xcj7TVUif+Nf7TnjIPAUy0DCMhmTUNHa43iKYp7PB888TjyrELjHM1JWmWCx8a12D0pGoWWmGpy23b9BNecR52w3xBKCe393KJv2Zuvrvh9wrUQUdSKDx5BU/UYcEeEIji+IgUE7lY90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598902083; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=nbZZ75N5Lj2UGdFcHd5mFwQwqhZQLNzIdcwGQo0Plag=; b=O8GoWRxPnFOdC1zKMmgCDu3EDO9HFTsoZpY9d80NeMLViKBvC4fGjbF39MH4dp2or3zaUUgZAgT8DMh5Vmvx7oCDGvcN+xKOphR6IoloST6qAnntPV3C3nLdQJUwU26K+9t11ByZQaCgH1xtIUIi0Vx+tSZbfWmGEoRVXnQ8HYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64860+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1598902083642930.2002340717181; Mon, 31 Aug 2020 12:28:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SzxmYY1788612xfZDpGL5jPq; Mon, 31 Aug 2020 12:28:02 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.61498.1598902081210448300 for ; Mon, 31 Aug 2020 12:28:01 -0700 IronPort-SDR: Z8amgBTk8jLiA0BZg6sv+dHl5obxzOYU/0cRrHYBJp4H4WIuAFUYzv5ssOm3697pT3zgM1ugGE etEUHMfgMLHQ== X-IronPort-AV: E=McAfee;i="6000,8403,9730"; a="158057153" X-IronPort-AV: E=Sophos;i="5.76,376,1592895600"; d="scan'208";a="158057153" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2020 12:27:59 -0700 IronPort-SDR: d/a74qbvT5E5BCiK1wr4nbH5Kbc+I721RxPtOxKoswgekB4W4QwfUU1vCo1IMiltQvRDX/cyma 1O0rDp848m1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,376,1592895600"; d="scan'208";a="501458988" X-Received: from nldesimo-desk1.amr.corp.intel.com ([10.209.78.110]) by fmsmga006.fm.intel.com with ESMTP; 31 Aug 2020 12:27:59 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley E Desimone , Puja Pandya , Bret Barkelew , Prince Agyeman , Erik Bjorge Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V2 1/2] EdkRepo: Add function to enumerate subst drives Date: Mon, 31 Aug 2020 12:27:43 -0700 Message-Id: <20200831192744.1836-2-nathaniel.l.desimone@intel.com> In-Reply-To: <20200831192744.1836-1-nathaniel.l.desimone@intel.com> References: <20200831192744.1836-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com X-Gm-Message-State: pKQtc3TqF6aIgbNY16VkvnVCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1598902082; bh=CtZAjDNdoag+I998Alx1Q5kQWW2QXA+K1fO/9t/eo6s=; h=Cc:Date:From:Reply-To:Subject:To; b=ZtXeNuyRhCO8GWlTXx/3btR/ERJ0rsWhO8CWL3CQVYlVbU9559Q0AJZni1WF3y0W42b EPULOgIxfmtfbqRbAU+whTwDJyeWKVqix6oKeDfEdWjaUshtmYy7Zf9AAEQ/93IN2eUuv EebINufPRIIsxnEB3RZQQr9SFoN/asDbChw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Cc: Ashley E Desimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Nate DeSimone --- edkrepo/common/pathfix.py | 50 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/edkrepo/common/pathfix.py b/edkrepo/common/pathfix.py index 1a9c20f..2775442 100644 --- a/edkrepo/common/pathfix.py +++ b/edkrepo/common/pathfix.py @@ -3,7 +3,7 @@ ## @file # checkout_command.py # -# Copyright (c) 2018- 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # import os @@ -11,6 +11,7 @@ import sys if sys.platform =3D=3D "win32": from ctypes import windll, POINTER, byref, GetLastError, Structure, Wi= nError from ctypes import c_void_p, c_ushort, c_int, c_ulong, c_wchar, c_wch= ar_p + from ctypes import create_unicode_buffer =20 def _is_wow64_process(): kernel32 =3D windll.kernel32 @@ -211,3 +212,50 @@ def expanduser(path): userhome =3D os.path.join(os.path.dirname(userhome), path[1:i]) =20 return userhome + path[i:] + +def get_subst_drive_dict(): + if sys.platform !=3D "win32": + return {} + def _query_subst_drive(drive_letter): + kernel32 =3D windll.kernel32 + QueryDosDevice =3D kernel32.QueryDosDeviceW + QueryDosDevice.argtypes =3D [c_wchar_p, c_wchar_p, c_ulong] + QueryDosDevice.restype =3D c_ulong + MAX_PATH =3D 260 + + if len(drive_letter) > 1 or len(drive_letter) =3D=3D 0: + raise ValueError("Bad drive letter") + drive =3D '{}:'.format(drive_letter.upper()) + drive_buffer =3D create_unicode_buffer(drive) + target_path_buffer_size =3D c_ulong(MAX_PATH) + target_path_buffer =3D create_unicode_buffer(target_path_buffer_si= ze.value) + while True: + count =3D QueryDosDevice(drive_buffer, target_path_buffer, tar= get_path_buffer_size) + if count =3D=3D 0: + last_error =3D GetLastError() + if last_error =3D=3D 122: #ERROR_INSUFFICIENT_BUFFER + #Increase the buffer size and try again + target_path_buffer_size =3D c_ulong((target_path_buffe= r_size.value * 161) / 100) + target_path_buffer =3D create_unicode_buffer(target_pa= th_buffer_size.value) + elif last_error =3D=3D 2: #ERROR_FILE_NOT_FOUND + #This is an invalid drive, return an empty string + return '' + else: + raise WinError(last_error) + else: + break + target_path =3D target_path_buffer.value + if len(target_path) > 4 and target_path[0:4] =3D=3D '\\??\\': + if (ord(target_path[4]) >=3D ord('A') and ord(target_path[4]) = <=3D ord('Z')) or \ + (ord(target_path[4]) >=3D ord('a') and ord(target_path[4])= <=3D ord('z')): + #This is a SUBST'd drive, return the path + return target_path[4:].strip() + #This is a non-SUBST'd (aka real) drive, return an empty string + return '' + subst_dict =3D {} + for index in range(26): + drive_letter =3D chr(ord('A') + index) + target_path =3D _query_subst_drive(drive_letter) + if target_path !=3D '': + subst_dict[drive_letter] =3D target_path + return subst_dict --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#64860): https://edk2.groups.io/g/devel/message/64860 Mute This Topic: https://groups.io/mt/76541437/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 05:38:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+64862+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64862+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1598902085; cv=none; d=zohomail.com; s=zohoarc; b=gfKR68D+Sf1c57IXI5odxUA4IktBYzu8xHzcqIxykgvy6HVryp8b7VdePFJ65BpdsN7PN7RXMhDuRzZrA/Sfdwqz5V9BSVJBopxcy7nkuW0oDvGeQv6/2IRjEVdN4F89kwqBowVUcT/MwW59L7xZ9smuikr7pd0TQzfhlyalq4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598902085; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=/rTL+nlxNKXH9aB6J+E0K7fF362WRgcoLahlEtZ8QIs=; b=S6wZGG88chiySoMDART0xzUrjDzUohYENYobWWNBr0oIhBzJolqwpWSQJAKDZgUdZZsPAyUDU5yFtZJt8CsMwUkTod2QWv5eQb4a6DHObtZXWjSaIzhpMCTRk8RTzz/GQHV7OMDLFl2bqbOvIhilvIAqNorNQN1hri/Dfypi6e4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64862+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1598902085258338.17619979813617; Mon, 31 Aug 2020 12:28:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8TNgYY1788612xLVemRwwgj6; Mon, 31 Aug 2020 12:28:04 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.61500.1598902082104036535 for ; Mon, 31 Aug 2020 12:28:02 -0700 IronPort-SDR: yJ2TDiLGnAH4JVyz2ubC3g/2ZsBh1jvHK5qwnjfvd+nT/1p5xhS2BkRIiwOWAK5DDmGnzluQf6 bCoiuRJcKE1A== X-IronPort-AV: E=McAfee;i="6000,8403,9730"; a="158057154" X-IronPort-AV: E=Sophos;i="5.76,376,1592895600"; d="scan'208";a="158057154" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2020 12:28:00 -0700 IronPort-SDR: bU6ty9w7VQi2MHj2K4QX2aEeuKOsinnjHkTDeE8Az2/tAo1rLMWeHawfGhuNVXwBQOaiA+sYeu 9ZEHbQ33sfdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,376,1592895600"; d="scan'208";a="501458992" X-Received: from nldesimo-desk1.amr.corp.intel.com ([10.209.78.110]) by fmsmga006.fm.intel.com with ESMTP; 31 Aug 2020 12:27:59 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley E Desimone , Puja Pandya , Bret Barkelew , Prince Agyeman , Erik Bjorge Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V2 2/2] EdkRepo: Add support for subst drives Date: Mon, 31 Aug 2020 12:27:44 -0700 Message-Id: <20200831192744.1836-3-nathaniel.l.desimone@intel.com> In-Reply-To: <20200831192744.1836-1-nathaniel.l.desimone@intel.com> References: <20200831192744.1836-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com X-Gm-Message-State: 2Mx12VQm70woC2cWgQSH1msnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1598902084; bh=ptnEJykG0HvnVfS+QBLstrHJiYe0QEKQtg9AATabfa4=; h=Cc:Date:From:Reply-To:Subject:To; b=iB2vgnGm2IczvPLTRO108IiiQ4lrWY46OTLCmsUoRdKKBM6SztHCknhOJcDwvAGTkod e0M3ImGCFPDzROdAaQwxpF74AAmz1Fc4dPO0Ul8D9Z4RrYXK8any7F2fbcqqJWGUyj8nE gk09fnUksXdct+ODdLBfavwVD4KM0P8KrKY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" get_workspace_path() now converts a virtual drive path to a real path before any git repo operations are done. Cc: Ashley E Desimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Nate DeSimone --- edkrepo/commands/clone_command.py | 6 ++++++ edkrepo/config/config_factory.py | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_com= mand.py index f638090..be5ad86 100644 --- a/edkrepo/commands/clone_command.py +++ b/edkrepo/commands/clone_command.py @@ -20,6 +20,7 @@ from edkrepo.common.edkrepo_exception import EdkrepoInval= idParametersException, from edkrepo.common.edkrepo_exception import EdkrepoManifestNotFoundExcept= ion from edkrepo.common.humble import CLONE_INVALID_WORKSPACE, CLONE_INVALID_P= ROJECT_ARG, CLONE_INVALID_COMBO_ARG from edkrepo.common.humble import SPARSE_CHECKOUT, CLONE_INVALID_LOCAL_ROO= TS +from edkrepo.common.pathfix import get_subst_drive_dict from edkrepo.common.workspace_maintenance.workspace_maintenance import cas= e_insensitive_single_match from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t pull_all_manifest_repos, find_project_in_all_indices from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t list_available_manifest_repos @@ -77,6 +78,11 @@ class CloneCommand(EdkrepoCommand): workspace_dir =3D os.getcwd() else: workspace_dir =3D os.path.abspath(workspace_dir) + subst =3D get_subst_drive_dict() + for drive in subst.keys(): + if '{}:'.format(drive) =3D=3D os.path.splitdrive(workspace_dir= )[0].upper(): + workspace_dir =3D os.path.join(subst[drive], os.path.split= drive(workspace_dir)[1][1:]) + workspace_dir =3D os.path.normpath(workspace_dir) if os.path.isdir(workspace_dir) and os.listdir(workspace_dir): raise EdkrepoInvalidParametersException(CLONE_INVALID_WORKSPAC= E) if not os.path.isdir(workspace_dir): diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index a82a438..1cb6eb7 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -11,13 +11,16 @@ import os import sys import configparser import collections -from ctypes import * +if sys.platform =3D=3D "win32": + from ctypes import oledll, c_void_p, c_uint32, c_wchar_p + from ctypes import create_unicode_buffer =20 import edkrepo.config.humble.config_factory_humble as humble from edkrepo.common.edkrepo_exception import EdkrepoGlobalConfigNotFoundEx= ception, EdkrepoConfigFileInvalidException from edkrepo.common.edkrepo_exception import EdkrepoWorkspaceInvalidExcept= ion, EdkrepoGlobalDataDirectoryNotFoundException from edkrepo.common.edkrepo_exception import EdkrepoConfigFileReadOnlyExce= ption from edkrepo.common.humble import MIRROR_PRIMARY_REPOS_MISSING, MIRROR_DEC= ODE_WARNING, MAX_PATCH_SET_INVALID +from edkrepo.common.pathfix import get_subst_drive_dict from edkrepo_manifest_parser import edk_manifest from edkrepo.common.pathfix import expanduser =20 @@ -238,6 +241,11 @@ def get_workspace_path(): while True: if os.path.isdir(os.path.join(path, "repo")): if os.path.isfile(os.path.join(os.path.join(path, "repo"), "Ma= nifest.xml")): + if sys.platform =3D=3D "win32": + subst =3D get_subst_drive_dict() + for drive in subst.keys(): + if '{}:'.format(drive) =3D=3D os.path.splitdrive(p= ath)[0].upper(): + path =3D os.path.join(subst[drive], os.path.sp= litdrive(path)[1][1:]) return path if os.path.dirname(path) =3D=3D path: break --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#64862): https://edk2.groups.io/g/devel/message/64862 Mute This Topic: https://groups.io/mt/76541439/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-