From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3649.1588365590739524866 for ; Fri, 01 May 2020 13:39:51 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: 5PD2SQyfBIqUf3q/I9Q/tQxCKeSaHIu2rVO93dE9QTURNMuOc9KsxsdcIu4CPdtYv02LXLO9Dq HSg2dtBpoVSg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 May 2020 13:39:49 -0700 IronPort-SDR: DQPPF6rGGoypw7fl+mxb1QdqEVAcpEJ+NJVYlFUGPrctamjFwPDh0x+LfRyxYR0TfYpw1cccPh N8faF+c9jVfg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,341,1583222400"; d="scan'208";a="460372437" Received: from aedesimo-desk.amr.corp.intel.com ([10.212.28.52]) by fmsmga006.fm.intel.com with ESMTP; 01 May 2020 13:39:49 -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 1/2] EdkRepo: Remove duplicate definition of generate_name_for_obsolete_backup Date: Fri, 1 May 2020 13:39:45 -0700 Message-Id: <20200501203946.17620-2-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20200501203946.17620-1-ashley.e.desimone@intel.com> References: <20200501203946.17620-1-ashley.e.desimone@intel.com> Remove the duplicate definition of generate_name_for_obsolete_backup from common_repo_functions.py and update imports to use the definition in workspace_maintenance.py Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/sync_command.py | 3 ++- edkrepo/common/common_repo_functions.py | 21 --------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/edkrepo/commands/sync_command.py b/edkrepo/commands/sync_command.py index cb9dc4b..82f5247 100644 --- a/edkrepo/commands/sync_command.py +++ b/edkrepo/commands/sync_command.py @@ -34,12 +34,13 @@ from edkrepo.common.humble import SYNC_REBASE_CALC_FAIL from edkrepo.common.pathfix import get_actual_path from edkrepo.common.common_repo_functions import pull_latest_manifest_repo, clone_repos, sparse_checkout_enabled from edkrepo.common.common_repo_functions import reset_sparse_checkout, sparse_checkout, verify_manifest_data -from edkrepo.common.common_repo_functions import generate_name_for_obsolete_backup, checkout_repos, check_dirty_repos +from edkrepo.common.common_repo_functions import checkout_repos, check_dirty_repos from edkrepo.common.common_repo_functions import update_editor_config from edkrepo.common.common_repo_functions import update_repo_commit_template, get_latest_sha from edkrepo.common.common_repo_functions import has_primary_repo_remote, fetch_from_primary_repo, in_sync_with_primary from edkrepo.common.common_repo_functions import update_hooks, maintain_submodules, combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, remove_included_config +from edkrepo.common.workspace_maintenance.workspace_maintenance import generate_name_for_obsolete_backup from edkrepo.common.ui_functions import init_color_console from edkrepo.config.config_factory import get_workspace_path, get_workspace_manifest, get_edkrepo_global_data_directory from edkrepo_manifest_parser.edk_manifest import CiIndexXml, ManifestXml diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py index 2aa5f5f..a333489 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -393,27 +393,6 @@ def checkout_repos(verbose, override, repos_to_checkout, workspace_path, manifes if repo_to_checkout.enable_submodule: maintain_submodules(repo_to_checkout, repo, verbose) - - -def generate_name_for_obsolete_backup(absolute_path): - if not os.path.exists(absolute_path): - raise ValueError("{} does not exist".format(absolute_path)) - original_name = os.path.basename(absolute_path) - dir_name = os.path.dirname(absolute_path) - unique_name = "" - unique_name_found = False - index = 1 - while not unique_name_found: - if index == 1: - unique_name = "{}_old".format(original_name) - else: - unique_name = "{}_old{}".format(original_name, index) - if not os.path.exists(os.path.join(dir_name, unique_name)): - unique_name_found = True - index += 1 - return unique_name - - def verify_manifest_data(global_manifest_directory, config, verbose=False, verify_all=False, verify_proj=None, verify_archived=False): # Validate the project individual project selected if verify_proj: -- 2.16.2.windows.1