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 85DB3138ACF for ; Fri, 9 Jan 2015 21:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E80FAE0849; Fri, 9 Jan 2015 21:07:30 +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 8BA19E0849 for ; Fri, 9 Jan 2015 21:07:30 +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 6A96634070E for ; Fri, 9 Jan 2015 21:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8074EF3A5 for ; Fri, 9 Jan 2015 21:07:27 +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: <1420736931.5c4b8d7eceee333f803941f40d2cc757ecf5f80b.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/actions.py gkeys/gkeys/seedhandler.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5c4b8d7eceee333f803941f40d2cc757ecf5f80b X-VCS-Branch: master Date: Fri, 9 Jan 2015 21:07:27 +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: 4bf282bf-b7bd-47b5-90e8-b46f8582b871 X-Archives-Hash: 59b506fbf070a622019870c3b07fa766 commit: 5c4b8d7eceee333f803941f40d2cc757ecf5f80b Author: Pavlos Ratis gentoo org> AuthorDate: Thu Jan 8 17:08:51 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 8 17:08:51 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=5c4b8d7e add checks to fetch-seed in case of missing category Added a check about categories in fetch-seed action because it failed when the command ran without a category --- gkeys/gkeys/actions.py | 3 ++- gkeys/gkeys/seedhandler.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index eef338e..4db3757 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -81,9 +81,10 @@ class Actions(object): def fetchseed(self, args): '''Download the selected seed file(s)''' self.logger.debug("ACTIONS: fetchseed; args: %s" % str(args)) + if not args.category: + return (False, ["Please specify seeds category."]) handler = SeedHandler(self.logger, self.config) success, messages = handler.fetch_seeds(args.category, args, self.verify) - messages.append("") messages.append("Fetch operation completed") return (False not in success, messages) diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py index 600ac35..5f15222 100644 --- a/gkeys/gkeys/seedhandler.py +++ b/gkeys/gkeys/seedhandler.py @@ -142,10 +142,10 @@ class SeedHandler(object): for seed in [seeds]: seedurl = self.config.get_key('seedurls', seed) seedpath = self.config.get_key('seeds', seed) - if http_check.match(seedurl): + if seedurl and seedpath and http_check.match(seedurl): urls.extend([(seed, seedurl, seedpath)]) else: - self.logger.info("Wrong seed file URLs... Skipping: %s" % seed) + self.logger.info("Wrong seed file URLs/seed path... Skipping: %s" % seed) except KeyError: pass succeeded = []