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 68DAC138A1A for ; Thu, 13 Nov 2014 18:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AFC7E0CC9; Thu, 13 Nov 2014 18:43:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8308FE0CC1 for ; Thu, 13 Nov 2014 18:43:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75066340526 for ; Thu, 13 Nov 2014 18:43:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AA83A111 for ; Thu, 13 Nov 2014 18:43:35 +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: <1415903991.421b4ac4b2b572653ef9dab7fc5a0f87d5c3bb09.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/maker.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 421b4ac4b2b572653ef9dab7fc5a0f87d5c3bb09 X-VCS-Branch: master Date: Thu, 13 Nov 2014 18:43:35 +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: 94c94469-dd0e-49c1-919f-0c3806230b27 X-Archives-Hash: 91c2e0243a1cda766c8287474ca4d344 commit: 421b4ac4b2b572653ef9dab7fc5a0f87d5c3bb09 Author: Brian Dolbec gentoo org> AuthorDate: Thu Nov 13 18:39:51 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Nov 13 18:39:51 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=421b4ac4 maker.py: Skip the protocol verification if it failed to guess one --- layman/maker.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/layman/maker.py b/layman/maker.py index c7d5139..3393d1b 100644 --- a/layman/maker.py +++ b/layman/maker.py @@ -348,9 +348,10 @@ class Interactive(object): sources.append(get_input(msg)) ovl_type = self.guess_overlay_type(sources[0]) - msg = 'Is %(type)s the correct overlay type?: '\ - % ({'type': ovl_type}) - correct = get_ans(msg) + if ovl_type: + msg = 'Is "%(type)s" the correct overlay type?: '\ + % ({'type': ovl_type}) + correct = get_ans(msg) while not ovl_type or not correct: msg = 'Please provide overlay type: ' ovl_type = self.check_overlay_type(\ @@ -368,9 +369,10 @@ class Interactive(object): sources.append(get_input('Define source URL: ')) ovl_type = self.guess_overlay_type(sources[0]) - msg = 'Is %(type)s the correct overlay type?: '\ - % ({'type': ovl_type}) - correct = get_ans(msg) + if ovl_type: + msg = 'Is %(type)s the correct overlay type?: '\ + % ({'type': ovl_type}) + correct = get_ans(msg) while not ovl_type or not correct: msg = 'Please provide overlay type: ' ovl_type = self.check_overlay_type(\