From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41159158091 for ; Tue, 31 May 2022 18:39:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54953E079E; Tue, 31 May 2022 18:39:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEFADE079E for ; Tue, 31 May 2022 18:39:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E43F0341AE9 for ; Tue, 31 May 2022 18:39:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4459B4D5 for ; Tue, 31 May 2022 18:39:00 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1654019477.c32caece8690c2a88bd12d4aa30cb27d8bdf25ef.dolsen@gentoo> Subject: [gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/ X-VCS-Repository: proj/mirrorselect X-VCS-Files: mirrorselect/configs.py mirrorselect/main.py X-VCS-Directories: mirrorselect/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c32caece8690c2a88bd12d4aa30cb27d8bdf25ef X-VCS-Branch: master Date: Tue, 31 May 2022 18:39:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 566e7b9d-cd10-488c-a18b-2a22e10ff9cc X-Archives-Hash: 4c4391c71c6c709f9c55a18080290e48 commit: c32caece8690c2a88bd12d4aa30cb27d8bdf25ef Author: Brian Dolbec gentoo org> AuthorDate: Tue May 31 17:51:17 2022 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue May 31 17:51:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=c32caece Remove remaining SYNC code Signed-off-by: Brian Dolbec gentoo.org> mirrorselect/configs.py | 9 ++------- mirrorselect/main.py | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py index 2dd6cba..93b2108 100644 --- a/mirrorselect/configs.py +++ b/mirrorselect/configs.py @@ -138,12 +138,10 @@ def write_repos_conf(output, config_path, var, value): " variable: %s\nChanges NOT SAVED" %var) -def get_filesystem_mirrors(output, config_path, sync=False): +def get_filesystem_mirrors(output, config_path): """Read the current mirrors and retain mounted filesystems mirrors @param config_path: string - @param sync: boolean, used to switch between SYNC and GENTOO_MIRRORS - make.conf variable target @rtype list """ @@ -158,10 +156,7 @@ def get_filesystem_mirrors(output, config_path, sync=False): fsmirrors = [] - if sync: - var = 'SYNC' - else: - var = 'GENTOO_MIRRORS' + var = 'GENTOO_MIRRORS' output.write('get_filesystem_mirrors(): config_path = %s\n' % config_path, 2) try: diff --git a/mirrorselect/main.py b/mirrorselect/main.py old mode 100755 new mode 100644 index 9cad25b..8a3094e --- a/mirrorselect/main.py +++ b/mirrorselect/main.py @@ -95,7 +95,7 @@ class MirrorSelect(object): @param out: boolean, used to redirect output to stdout @param config_path; string @param sync: boolean, used to switch between sync-uri repos.conf target, - SYNC and GENTOO_MIRRORS make.conf variable target + and GENTOO_MIRRORS make.conf variable target """ if sync: var = "sync-uri" @@ -371,7 +371,7 @@ class MirrorSelect(object): self.output.print_err("main(); Exiting due to missing repos.conf/gentoo.conf file\n") fsmirrors = get_filesystem_mirrors(self.output, - config_path, options.rsync) + config_path) hosts = self.get_available_hosts(options)