From f27ecd1674e846dcae983a1a076994f54fb5f0fb Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Wed, 5 Jun 2024 03:52:02 +0800 Subject: [PATCH] style(deploy): rename `working_dir_root` variable to `workspace_dir` --- fdroidserver/deploy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py index 739defdf..4c79977b 100644 --- a/fdroidserver/deploy.py +++ b/fdroidserver/deploy.py @@ -633,11 +633,11 @@ def update_servergitmirrors(servergitmirrors, repo_section): return options = common.get_options() - working_dir_root = Path(os.getcwd()) + workspace_dir = Path(os.getcwd()) # right now we support only 'repo' git-mirroring if repo_section == 'repo': - git_mirror_path = working_dir_root / 'git-mirror' + git_mirror_path = workspace_dir / 'git-mirror' dotgit = os.path.join(git_mirror_path, '.git') git_fdroiddir = os.path.join(git_mirror_path, 'fdroid') git_repodir = os.path.join(git_fdroiddir, repo_section) @@ -702,9 +702,9 @@ def update_servergitmirrors(servergitmirrors, repo_section): # trailing slashes have a meaning in rsync which is not needed here, so # make sure both paths have exactly one trailing slash if is_index_only: - files_to_sync = [str(working_dir_root / repo_section / index_file) for index_file in INDEX_FILES] + files_to_sync = [str(workspace_dir / repo_section / index_file) for index_file in INDEX_FILES] else: - files_to_sync = [str(working_dir_root / repo_section).rstrip('/') + '/'] + files_to_sync = [str(workspace_dir / repo_section).rstrip('/') + '/'] common.local_rsync(common.get_options(), files_to_sync, git_repodir.rstrip('/') + '/') @@ -809,7 +809,7 @@ def upload_to_servergitmirror(mirror_config: Dict[str, str], local_repo.index.add(['.gitlab-ci.yml']) local_repo.index.commit("fdroidserver git-mirror: Deploy to GitLab Pages") - logging.debug(_('Pushing to {url}').format(url=remote.url)) + logging.info(_('Pushing to {url}').format(url=remote.url)) with local_repo.git.custom_environment(GIT_SSH_COMMAND=ssh_cmd): pushinfos = remote.push( f"{local_branch_name}:{remote_branch_name}", force=True, set_upstream=True, progress=progress