From nobody Mon Feb 9 09:52:31 2026 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+59020+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+59020+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1589158231; cv=none; d=zohomail.com; s=zohoarc; b=mzUCYiwiNtGK8BPMzBWXFrFHl6FL6ikh/H7SZZr9MaO4IUQa0r4x++nUiwzcu08dMffl9vJFlOAeO7D+0gK9kik/A4Kx5IUBCdMjE4wUcQ9ERv2/Hzo+dgFlLpIC1qYIWvxVDWhwXBzn4OGshXl6m/4tP8Pe3XGC6q2ktMbyAgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589158231; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=7ON+VsftcKepUZCAIUwJvmZgmaZL48snyithzYnUyrg=; b=iBfgjTxNqiprzPMoHUFYVXaqD9lVzCkqxJ+L2pR6+5uy7u1zklCfb2dwpMFXNjcq2u7fa+sqWVTecddkczyDbSn6nJqxBTPqBiqA2FOZi/3JkBSwvEFwxxphLQVouFgGX3l5K7R4AxTS6mA7uVHrrzQV3Vt+fSvMLSBhiYryjWQ= 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+59020+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 1589158230952116.60753717833052; Sun, 10 May 2020 17:50:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qB5mYY1788612x3qGlCAvCwp; Sun, 10 May 2020 17:50:30 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.4017.1589158230010710343 for ; Sun, 10 May 2020 17:50:30 -0700 IronPort-SDR: yY/yrGwDOzEkD+HOADdW3SrHHI3No6nJRXFD6lLrFBBlvtTuivAqCxZvQzA75HvKWGjzGdQjwy AXghv1YkewTQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2020 17:50:29 -0700 IronPort-SDR: mcwqjwLV96WpKdaaIj95/s2xm0LN6dU6ZuhAZWm5DxrS/7XFCdjm1w0S5BhFsUlOq/r+XOPbvX 0kGbxXdT/s+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,377,1583222400"; d="scan'208";a="296747715" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.212.208.216]) by fmsmga002.fm.intel.com with ESMTP; 10 May 2020 17:50:29 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staing/EdkRepo] [PATCH 2/4] EdkRepo: Remove unused functions from common_repo_functions.py Date: Sun, 10 May 2020 17:50:24 -0700 Message-Id: <20200511005026.23532-3-ashley.e.desimone@intel.com> In-Reply-To: <20200511005026.23532-1-ashley.e.desimone@intel.com> References: <20200511005026.23532-1-ashley.e.desimone@intel.com> 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,ashley.e.desimone@intel.com X-Gm-Message-State: n6HyoRN0u1XAdgdBxqzDtDbEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589158230; bh=Av9zt5FprkP9Hi3e3mvUizUb2/K7MjOm+tCPdWPbYHc=; h=Cc:Date:From:Reply-To:Subject:To; b=Pi42npvi9b4MOhsJXVXIIViqS5grrtUrMXCQxyRxDmHlRldFQ+sACwSSlzMZBB4aOtl xtXHxuAc+yRhUhh/Fi1harP+22lyygScORMutKfWISU2EOdbeApniHBdSFOLlSRZ/0Cs3 3K2T6xCwm4+WPbZVX7dmR3sQPXSws7ThWkI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove unused functions from common_repo_functions.py and remove any remaining imports of them. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/manifest_command.py | 2 +- edkrepo/common/common_repo_functions.py | 40 -----------------------------= ---- edkrepo/common/humble.py | 4 ++-- 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/edkrepo/commands/manifest_command.py b/edkrepo/commands/manife= st_command.py index bb6252d..5c6184f 100644 --- a/edkrepo/commands/manifest_command.py +++ b/edkrepo/commands/manifest_command.py @@ -16,7 +16,7 @@ from edkrepo.commands.edkrepo_command import EdkrepoComma= nd from edkrepo.commands.edkrepo_command import ColorArgument import edkrepo.commands.arguments.manifest_args as arguments from edkrepo.common.edkrepo_exception import EdkrepoWorkspaceInvalidExcept= ion, EdkrepoManifestNotFoundException -from edkrepo.common.common_repo_functions import pull_latest_manifest_repo= , validate_manifest_repo +from edkrepo.common.common_repo_functions import validate_manifest_repo from edkrepo.common.ui_functions import init_color_console from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t list_available_manifest_repos from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t pull_all_manifest_repos diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/commo= n_repo_functions.py index eb6c4c0..5ec834b 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -73,14 +73,6 @@ CLEAR_LINE =3D '\x1b[K' DEFAULT_REMOTE_NAME =3D 'origin' PRIMARY_REMOTE_NAME =3D 'primary' =20 -def pull_latest_manifest_repo(args, config, reset_hard=3DFalse): - repo_url =3D config['cfg_file'].manifest_repo_url - branch =3D config['cfg_file'].manifest_repo_branch - local_path =3D config['cfg_file'].manifest_repo_local_path - init_color_console(False) - pull_single_manifest_repo(repo_url, branch, local_path, reset_hard) - - def clone_repos(args, workspace_dir, repos_to_clone, project_client_side_h= ooks, config, skip_submodule, manifest): for repo_to_clone in repos_to_clone: local_repo_path =3D os.path.join(workspace_dir, repo_to_clone.root) @@ -395,38 +387,6 @@ def checkout_repos(verbose, override, repos_to_checkou= t, workspace_path, manifes if repo_to_checkout.enable_submodule: maintain_submodules(repo_to_checkout, repo, verbose) =20 -def verify_manifest_data(global_manifest_directory, config, verbose=3DFals= e, verify_all=3DFalse, verify_proj=3DNone, verify_archived=3DFalse): - # Validate the project individual project selected - if verify_proj: - print(VERIFY_PROJ.format(verify_proj)) - ci_index_path =3D os.path.join(config['cfg_file'].manifest_repo_ab= s_local_path, 'CiIndex.xml') - ci_index =3D CiIndexXml(ci_index_path) - try: - proj_path =3D find_project_in_index(verify_proj, ci_index, con= fig['cfg_file'].manifest_repo_abs_local_path, VERIFY_PROJ_NOT_IN_INDEX.form= at(verify_proj)) - except EdkrepoInvalidParametersException: - raise - if proj_path: - proj_val_data =3D validate_manifestfiles([proj_path]) - proj_val_error =3D get_manifest_validation_status(proj_val_dat= a) - if proj_val_error: - if verbose: - print_manifest_errors(proj_val_data) - raise EdkrepoManifestInvalidException(VERIFY_PROJ_FAIL.for= mat(verify_proj)) - - # Validate the entire global manifest repository. - if verify_all: - print(VERIFY_GLOBAL) - if verify_archived: - print(VERIFY_ARCHIVED) - # Attempt to make sure the manifest data is good - manifestfile_validation_data =3D validate_manifestrepo(global_mani= fest_directory, verify_archived) - manifest_repo_error =3D get_manifest_validation_status(manifestfil= e_validation_data) - # Display errors - if manifest_repo_error: - print(VERIFY_GLOBAL_FAIL) - if verbose: - print_manifest_errors(manifestfile_validation_data) - def validate_manifest_repo(manifest_repo, verbose=3DFalse, archived=3DFals= e): print(VERIFY_GLOBAL) if archived: diff --git a/edkrepo/common/humble.py b/edkrepo/common/humble.py index 8ca38bb..f905357 100644 --- a/edkrepo/common/humble.py +++ b/edkrepo/common/humble.py @@ -41,7 +41,7 @@ SYNC_COMMITS_ON_MASTER =3D 'Commits were found on {0} bra= nch.\n (use the "--overr SYNC_ERROR =3D '\nError: Some repositories were not updated.' SYNC_MANIFEST_NOT_FOUND =3D 'A manifest for project, {0}, was not found.\n= To complete this operation please rerun the command with the --override fla= g\n' + SYNC_EXIT SYNC_URL_CHANGE =3D 'The URL for the remote, {0} has changed.\n' + SYNC_EX= IT -SYNC_COMBO_CHANGE =3D 'The current checked out combination, {0}, does not = exist in the latest manifest for project, {1}\n'=20 +SYNC_COMBO_CHANGE =3D 'The current checked out combination, {0}, does not = exist in the latest manifest for project, {1}\n' SYNC_REPO_CHANGE =3D 'The latest manifest for project, {0}, requires a cha= nge in currently cloned repositories.\nTo complete this operation please re= run the command with the --override flag\n' + SYNC_EXIT SYNC_SOURCE_MOVE_WARNING =3D '{}{}WARNING:{}{} {{}} being moved to {{}}'.f= ormat(Style.BRIGHT, Fore.RED, Style.RESET_ALL, Fore.RED) SYNC_REMOVE_WARNING =3D '{}{}WARNING:{}{} The following repos no longer ex= ist in the new manifest and can no \nlonger be used for submitting code. Pl= ease manually delete the following \ndirectories after saving any work you = have in them:'.format(Style.BRIGHT, Fore.RED, Style.RESET_ALL, Fore.RED) @@ -130,7 +130,7 @@ ERROR_WRITING_INCLUDE =3D 'An error occured while writt= ing the URL redirection con #Error messages for squash.py SQUASH_COMMON_ANCESTOR_REQUIRED =3D '{} is not in the same branch history = as {}, unable to operate on this commit range.' =20 -# Messages for common_repo_functions.verify_manifest_data() +# Messages for common_repo_functions. VERIFY_GLOBAL =3D 'Verifying the active projects in the global manifest re= pository\n' VERIFY_ARCHIVED =3D 'Verifying the archived projects in the global manifes= t repository\n' VERIFY_GLOBAL_FAIL =3D 'Unable to verify the contents of the global manife= st repository\n' --=20 2.16.2.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 (#59020): https://edk2.groups.io/g/devel/message/59020 Mute This Topic: https://groups.io/mt/74126915/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-