Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/
Date: Tue, 31 May 2022 18:39:04
Message-Id: 1654019477.c32caece8690c2a88bd12d4aa30cb27d8bdf25ef.dolsen@gentoo
1 commit: c32caece8690c2a88bd12d4aa30cb27d8bdf25ef
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 17:51:17 2022 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 17:51:17 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=c32caece
7
8 Remove remaining SYNC code
9
10 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
11
12 mirrorselect/configs.py | 9 ++-------
13 mirrorselect/main.py | 4 ++--
14 2 files changed, 4 insertions(+), 9 deletions(-)
15
16 diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
17 index 2dd6cba..93b2108 100644
18 --- a/mirrorselect/configs.py
19 +++ b/mirrorselect/configs.py
20 @@ -138,12 +138,10 @@ def write_repos_conf(output, config_path, var, value):
21 " variable: %s\nChanges NOT SAVED" %var)
22
23
24 -def get_filesystem_mirrors(output, config_path, sync=False):
25 +def get_filesystem_mirrors(output, config_path):
26 """Read the current mirrors and retain mounted filesystems mirrors
27
28 @param config_path: string
29 - @param sync: boolean, used to switch between SYNC and GENTOO_MIRRORS
30 - make.conf variable target
31 @rtype list
32 """
33
34 @@ -158,10 +156,7 @@ def get_filesystem_mirrors(output, config_path, sync=False):
35
36 fsmirrors = []
37
38 - if sync:
39 - var = 'SYNC'
40 - else:
41 - var = 'GENTOO_MIRRORS'
42 + var = 'GENTOO_MIRRORS'
43
44 output.write('get_filesystem_mirrors(): config_path = %s\n' % config_path, 2)
45 try:
46
47 diff --git a/mirrorselect/main.py b/mirrorselect/main.py
48 old mode 100755
49 new mode 100644
50 index 9cad25b..8a3094e
51 --- a/mirrorselect/main.py
52 +++ b/mirrorselect/main.py
53 @@ -95,7 +95,7 @@ class MirrorSelect(object):
54 @param out: boolean, used to redirect output to stdout
55 @param config_path; string
56 @param sync: boolean, used to switch between sync-uri repos.conf target,
57 - SYNC and GENTOO_MIRRORS make.conf variable target
58 + and GENTOO_MIRRORS make.conf variable target
59 """
60 if sync:
61 var = "sync-uri"
62 @@ -371,7 +371,7 @@ class MirrorSelect(object):
63 self.output.print_err("main(); Exiting due to missing repos.conf/gentoo.conf file\n")
64
65 fsmirrors = get_filesystem_mirrors(self.output,
66 - config_path, options.rsync)
67 + config_path)
68
69 hosts = self.get_available_hosts(options)