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 6660F138202 for ; Wed, 16 Oct 2013 08:36:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E597E09B8; Wed, 16 Oct 2013 08:36:47 +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 94942E0969 for ; Wed, 16 Oct 2013 08:36:46 +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 8BF7A33EFCA for ; Wed, 16 Oct 2013 08:36:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 19CB0E5464 for ; Wed, 16 Oct 2013 08:36:44 +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: <1381912546.b14ff1ed1877ccd244d76ead7fd9b66fd8c6f9f1.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: b14ff1ed1877ccd244d76ead7fd9b66fd8c6f9f1 X-VCS-Branch: master Date: Wed, 16 Oct 2013 08:36:44 +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: efa066a0-9e52-4347-87b4-2208d8d0fa0e X-Archives-Hash: 8df3268fbd6cf616a2e09237dadba596 commit: b14ff1ed1877ccd244d76ead7fd9b66fd8c6f9f1 Author: Brian Dolbec gentoo org> AuthorDate: Wed Oct 16 08:35:46 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Oct 16 08:35:46 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=b14ff1ed Force -o for -a + -r options to prevent multiple results being saved to the config. --- mirrorselect/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mirrorselect/main.py b/mirrorselect/main.py index 6a9c43d..5f7dc64 100755 --- a/mirrorselect/main.py +++ b/mirrorselect/main.py @@ -243,7 +243,7 @@ class MirrorSelect(object): group = parser.add_option_group("Main modes") group.add_option( "-a", "--all_mirrors", action="store_true", default=False, - help="This will present a list of all results" + help="This will present a list of all filtered search results " "to make it possible to select mirrors you wish to use.") group.add_option( "-i", "--interactive", action="store_true", default=False, @@ -335,6 +335,12 @@ class MirrorSelect(object): 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') + elif options.rsync and options.all_mirrors and not options.output: + # force output to screen. + # multiple uri's break normal sync operation + options.output = True + self.output.print_info("Forcing output to screen, as " + "multiple rsync uris are not supported\n") if options.interactive and ( options.deep or