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 3A46D13881C for ; Thu, 24 Sep 2015 15:24:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9033021C003; Thu, 24 Sep 2015 15:24: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 3409E21C002 for ; Thu, 24 Sep 2015 15:24:38 +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 1A5AE3408EA for ; Thu, 24 Sep 2015 15:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC8F4236 for ; Thu, 24 Sep 2015 15:24:34 +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: <1443108191.5ebf2c4b0aa6b1e08f36c9dd56fcab152d54d785.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/checks/ebuilds/fetches.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/checks/ebuilds/ pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5ebf2c4b0aa6b1e08f36c9dd56fcab152d54d785 X-VCS-Branch: master Date: Thu, 24 Sep 2015 15:24:34 +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: 2c0e9eb3-0ded-4dd1-8a32-3d34945d43a8 X-Archives-Hash: e15d28f5a15cd2416ae141c42935c281 commit: 5ebf2c4b0aa6b1e08f36c9dd56fcab152d54d785 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 24 15:22:04 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Sep 24 15:23:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ebf2c4b repoman: Remve the redundant repoman_settings initialaztion parameter repoman_settings is available as part of repo_settings. Use the repo_settings instance directly. pym/repoman/checks/ebuilds/fetches.py | 4 ++-- pym/repoman/scanner.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/repoman/checks/ebuilds/fetches.py b/pym/repoman/checks/ebuilds/fetches.py index 0b9c321..077340d 100644 --- a/pym/repoman/checks/ebuilds/fetches.py +++ b/pym/repoman/checks/ebuilds/fetches.py @@ -17,7 +17,7 @@ class FetchChecks(object): '''Performs checks on the files needed for the ebuild''' def __init__( - self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings): + self, qatracker, repo_settings, portdb, vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -27,7 +27,7 @@ class FetchChecks(object): self.portdb = portdb self.qatracker = qatracker self.repo_settings = repo_settings - self.repoman_settings = repoman_settings + self.repoman_settings = repo_settings.repoman_settings self.vcs_settings = vcs_settings def check(self, xpkg, checkdir, checkdir_relative, mychanged, mynew): diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index ace878a..1e1a38e 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -199,7 +199,7 @@ class Scanner(object): self.qatracker, self.repo_settings.repoman_settings, self.repo_settings, self.portdb, self.vcs_settings) self.status_check = VCSStatus(self.vcs_settings, self.qatracker) self.fetchcheck = FetchChecks( - self.qatracker, self.repo_settings.repoman_settings, self.repo_settings, self.portdb, self.vcs_settings) + self.qatracker, self.repo_settings, self.portdb, self.vcs_settings) self.pkgmeta = PkgMetadata(self.options, self.qatracker, self.repo_settings.repoman_settings) self.thirdparty = ThirdPartyMirrors(self.repo_settings.repoman_settings, self.qatracker) self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)