From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 347CD139085 for ; Sat, 24 Dec 2016 09:41:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D65012340EA; Sat, 24 Dec 2016 09:41:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A66222340EA for ; Sat, 24 Dec 2016 09:41:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADBA1340FC1 for ; Sat, 24 Dec 2016 09:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E415524EE for ; Sat, 24 Dec 2016 09:41:17 +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: <1482572427.59baf2fa65964e2cc8134f414d9536e7dcde5d9f.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:gsoc-2016 commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/base.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 59baf2fa65964e2cc8134f414d9536e7dcde5d9f X-VCS-Branch: gsoc-2016 Date: Sat, 24 Dec 2016 09:41:17 +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: 2f4a9336-41ed-4202-b633-5baf6d5d9e8d X-Archives-Hash: b91b1e83f3b41cbf22771a2efc35c7f6 commit: 59baf2fa65964e2cc8134f414d9536e7dcde5d9f Author: Brian Dolbec gentoo org> AuthorDate: Sat Dec 24 09:11:08 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Dec 24 09:40:27 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=59baf2fa gkeys base.py: Remove the auto-update code from run() This code was causing the fetch-seed action to fail with empty urls to connect to. This code should also not be running directly from the CliBase class. I'll move this code to the actions or lib class, to be determined later. gkeys/gkeys/base.py | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py index 28dd0b2..a67b330 100644 --- a/gkeys/gkeys/base.py +++ b/gkeys/gkeys/base.py @@ -358,7 +358,6 @@ class CliBase(object): return False return True - def run(self, args): '''Run the action selected @@ -366,59 +365,6 @@ class CliBase(object): ''' # establish our actions instance self.actions = self.cli_config['Actions'](self.config, self.output_results, self.logger) - # check for seed update - from sslfetch.connections import Connector - connector_output = { - 'info': self.logger.info, - 'debug': self.logger.debug, - 'error': self.logger.error, - 'exception': self.logger.exception, - 'warning': self.warning_output, - 'kwargs-info': {}, - 'kwargs-debug': {}, - 'kwargs-error': {}, - 'kwargs-exception': {}, - 'kwargs-warning': {}, - } - fetcher = Connector(connector_output, None, "Gentoo Keys") - successes = [] - up_to_date = True - categories = list(self.config.defaults['seeds']) - '''Attemp to download seed and seed.sig files for each available category''' - for category in categories: - filepath = self.config.defaults['seedsdir'] + "/" + category + ".seeds" - timestamp_path = filepath + ".timestamp" - url = self.config.defaults['seedurls'][category] - success, signedfile, timestamp = fetcher.fetch_file( - url, filepath, timestamp_path) - if timestamp != "": - up_to_date = False - successes.append(success) - url += ".sig" - filepath += ".sig" - success, signedfile, timestamp = fetcher.fetch_file( - url, filepath, timestamp_path) - if timestamp != "": - up_to_date = False - successes.append(success) - if False not in successes and not up_to_date: - print("Seeds need to be updated") - ack = None - while ack not in ("y", "yes", "n", "no"): - ack = py_input("Would you like to update the seeds now? (y/n) ").lower() - if ack in ("y", "yes"): - custom_args = copy.copy(args) - for attr in GKEY._fields: - if attr != "debug": - custom_args.attr = None - custom_args.category = None - custom_args.action = "update-seed" - print("Updating seeds") - self.run(custom_args) - elif False not in successes: - print("Seeds are up to date") - else: - print("Seed update check failed, check your internet connection.") # run the action func = getattr(self.actions, '%s' % self.cli_config['Action_Map'][args.action]['func'])