[gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/, pym/repoman/

[Brian Dolbec]

commit:     5ebf2c4b0aa6b1e08f36c9dd56fcab152d54d785
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 15:22:04 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> 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)