From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.2967.1588816760418133382 for ; Wed, 06 May 2020 18:59:20 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: YAUqg2ujherxHxrUE+UMSUmjuM7SDaTA9dHWTwB4Kzq7ZKFXy6ARFdqh8M9709ifg3CXtPD+z1 QncW9Iskgu7Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 18:59:19 -0700 IronPort-SDR: IYR95uY2RDE3+2aqEzDhrdcfFp0e2/1jfbY6jyFhIBDRTPlXhHm4aQFbj6oqZQvMhnOxhBLZea grmzf0P/eVrw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,361,1583222400"; d="scan'208";a="339205673" Received: from aedesimo-desk.amr.corp.intel.com ([10.254.1.137]) by orsmga001.jf.intel.com with ESMTP; 06 May 2020 18:59:19 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH] EkdRepo: Update Checkout Pin to Support Multiple Manifest Repos Date: Wed, 6 May 2020 18:59:17 -0700 Message-Id: <20200507015917.2704-1-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 Update the checkout pin command to look for pin files only in the workspace's source manifest repository. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/checkout_pin_command.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/checkout_pin_command.py index 31df825..5272236 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -11,13 +11,15 @@ import os from git import Repo -from edkrepo.commands.edkrepo_command import EdkrepoCommand, OverrideArgument +from edkrepo.commands.edkrepo_command import EdkrepoCommand, OverrideArgument, SourceManifestRepoArgument import edkrepo.commands.arguments.checkout_pin_args as arguments import edkrepo.commands.humble.checkout_pin_humble as humble from edkrepo.common.common_repo_functions import sparse_checkout_enabled, reset_sparse_checkout, sparse_checkout from edkrepo.common.common_repo_functions import check_dirty_repos, checkout_repos, combinations_in_manifest from edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersException, EdkrepoProjectMismatchException +from edkrepo.common.workspace_maintenance.manifest_repos_maintenance import find_project_in_all_indices +from edkrepo.common.workspace_maintenance.humble.manifest_repos_maintenance_humble import PROJ_NOT_IN_REPO, SOURCE_MANIFEST_REPO_NOT_FOUND from edkrepo.config.config_factory import get_workspace_path, get_workspace_manifest from edkrepo_manifest_parser.edk_manifest import ManifestXml @@ -38,12 +40,25 @@ class CheckoutPinCommand(EdkrepoCommand): 'required' : True, 'help-text' : arguments.PIN_FILE_HELP}) args.append(OverrideArgument) + args.append(SourceManifestRepoArgument) return metadata def run_command(self, args, config): workspace_path = get_workspace_path() manifest = get_workspace_manifest() - pin_path = self.__get_pin_path(args, workspace_path, config['cfg_file'].manifest_repo_abs_local_path, manifest) + + manifest_repo, cfg, manifest_path = find_project_in_all_indices (manifest.project_info.codename, + config['cfg_file'], + config['user_cfg_file'], + PROJ_NOT_IN_REPO.format(manifest.project_info.codename), + SOURCE_MANIFEST_REPO_NOT_FOUND.format(manifest.project_info.codename), + args.source_manifest_repo) + if 'user' not in cfg: + manifest_repo_path = config['cfg_file'].manifest_repo_abs_path(manifest_repo) + else: + manifest_repo_path = config['user_cfg_file'].manifest_repo_abs_path(manifest_repo) + + pin_path = self.__get_pin_path(args, workspace_path, manifest_repo_path, manifest) pin = ManifestXml(pin_path) manifest_sources = manifest.get_repo_sources(manifest.general_config.current_combo) check_dirty_repos(manifest, workspace_path) -- 2.16.2.windows.1