From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6FF841381F3 for ; Tue, 15 Oct 2013 22:43:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 742DFE084C; Tue, 15 Oct 2013 22:43:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 025EAE084C for ; Tue, 15 Oct 2013 22:43:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB1A833EFBE for ; Tue, 15 Oct 2013 22:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 507F5E5308 for ; Tue, 15 Oct 2013 22:43:36 +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: <1381876957.820ef8d8ba8bfe20eec5bc929381312f72e1c65f.dol-sen@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: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 820ef8d8ba8bfe20eec5bc929381312f72e1c65f X-VCS-Branch: master Date: Tue, 15 Oct 2013 22:43:36 +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-Archives-Salt: 8393a0dd-4a5e-4d90-bf4f-6593e6813511 X-Archives-Hash: 0c731c30f34a29d76e4af77cc16bd82b commit: 820ef8d8ba8bfe20eec5bc929381312f72e1c65f Author: Brian Dolbec gentoo org> AuthorDate: Tue Oct 15 22:42:37 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Oct 15 22:42:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=820ef8d8 Add -a to rsync sanity checks. --- mirrorselect/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mirrorselect/main.py b/mirrorselect/main.py index cfdcd55..45cc30b 100755 --- a/mirrorselect/main.py +++ b/mirrorselect/main.py @@ -268,7 +268,7 @@ class MirrorSelect(object): group.add_option( "-r", "--rsync", action="store_true", default=False, help="rsync mode. Allows you to interactively select your" - " rsync mirror. Requires -i to be used.") + " rsync mirror. Requires -i or -a to be used.") group.add_option( "-4", "--ipv4", action="store_true", default=False, help="only use IPv4") @@ -333,8 +333,8 @@ class MirrorSelect(object): options.ipv6 = False self.output.print_err('The --ipv6 option requires python ipv6 support') - if options.rsync and not options.interactive: - self.output.print_err('rsync servers can only be selected with -i') + if options.rsync and not (options.interactive or options.all_mirrors): + self.output.print_err('rsync servers can only be selected with -i or -a') if options.interactive and ( options.deep or