From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1402892-garchives=archives.gentoo.org@lists.gentoo.org>
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 EF4C4158091
for <garchives@archives.gentoo.org>; Tue, 31 May 2022 02:23:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1E9DCE09D0;
Tue, 31 May 2022 02:23:03 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 pigeon.gentoo.org (Postfix) with ESMTPS id BB815E09D0
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2022 02:23:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 F0BBF341896
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2022 02:23:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 61C41458
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2022 02:22:59 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
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" <dolsen@gentoo.org>
Message-ID: <1653963749.738c6f83b48c9f33ae17551b725756a1e94437fb.dolsen@gentoo>
Subject: [gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/
X-VCS-Repository: proj/mirrorselect
X-VCS-Files: mirrorselect/main.py
X-VCS-Directories: mirrorselect/
X-VCS-Committer: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 738c6f83b48c9f33ae17551b725756a1e94437fb
X-VCS-Branch: master
Date: Tue, 31 May 2022 02:22:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2f803e00-ef4e-466b-8b65-0bc5520d739e
X-Archives-Hash: 4e861751f6721cad150be2d904d22f43
commit: 738c6f83b48c9f33ae17551b725756a1e94437fb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:06:54 2022 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:22:29 2022 +0000
URL: https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=738c6f83
main.py: Fix bug 600572 Remove SYNC variable usage
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
mirrorselect/main.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index b0a68cc..9cad25b 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -343,12 +343,12 @@ class MirrorSelect(object):
@rtype: string
'''
if rsync:
- # startwith repos.conf
+ # repos.conf
config_path = EPREFIX + '/etc/portage/repos.conf/gentoo.conf'
if not os.access(config_path, os.F_OK):
self.output.write("Failed access to gentoo.conf: "
"%s\n" % os.access(config_path, os.F_OK), 2)
- return get_make_conf_path(EPREFIX)
+ config_path = None
return config_path
return get_make_conf_path(EPREFIX)
@@ -363,12 +363,12 @@ class MirrorSelect(object):
self.output.verbosity = options.verbosity
self.output.write("main(); config_path = %s\n" % config_path, 2)
- # reset config_path to find repos.conf/gentoo.conf if it exists
+ # reset config_path to find repos.conf/gentoo.conf
if options.rsync:
config_path = self.get_conf_path(options.rsync)
self.output.write("main(); reset config_path = %s\n" % config_path, 2)
- else:
- self.output.write("main(); rsync = %s\n" % str(options.rsync),2)
+ if not config_path:
+ 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)