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 0D1CD138206 for ; Fri, 29 Apr 2016 17:25:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 859CC21C035; Fri, 29 Apr 2016 17:24:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EFD3F21C044 for ; Fri, 29 Apr 2016 17:24:49 +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 010A6340D8D for ; Fri, 29 Apr 2016 17:24:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DB2B343 for ; Fri, 29 Apr 2016 17:24:45 +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: <1461600702.4a0072779d465cb7b0bd9e396e78772c8a45d051.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/, pym/repoman/modules/scan/status/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/status/__init__.py pym/repoman/modules/scan/status/vcsstatus.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/modules/scan/status/ pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4a0072779d465cb7b0bd9e396e78772c8a45d051 X-VCS-Branch: master Date: Fri, 29 Apr 2016 17:24:45 +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: 5c3e8a31-3b06-4d4c-b204-64dc0e8390e4 X-Archives-Hash: f2fd26531bb3660feca11429fb3e1a52 Message-ID: <20160429172445.HJxQmc1E-8SLzFrm0vqCxl2fi43AFkls5ut5Y3APwiI@z> commit: 4a0072779d465cb7b0bd9e396e78772c8a45d051 Author: Brian Dolbec gentoo org> AuthorDate: Mon Apr 25 16:11:42 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Apr 25 16:11:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a007277 repoman: Clean up some no longer used eadded variables pym/repoman/modules/scan/status/__init__.py | 1 - pym/repoman/modules/scan/status/vcsstatus.py | 5 +---- pym/repoman/scanner.py | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pym/repoman/modules/scan/status/__init__.py b/pym/repoman/modules/scan/status/__init__.py index 5f30639..1abf580 100644 --- a/pym/repoman/modules/scan/status/__init__.py +++ b/pym/repoman/modules/scan/status/__init__.py @@ -23,7 +23,6 @@ module_spec = { 'func_kwargs': { 'checkdir': (None, None), 'checkdir_relative': (None, None), - 'eadded': ('Future', 'UNSET'), 'xpkg': (None, None), }, }, diff --git a/pym/repoman/modules/scan/status/vcsstatus.py b/pym/repoman/modules/scan/status/vcsstatus.py index fd56560..ab81a11 100644 --- a/pym/repoman/modules/scan/status/vcsstatus.py +++ b/pym/repoman/modules/scan/status/vcsstatus.py @@ -24,16 +24,13 @@ class VCSStatus(ScanBase): @param checkdir: string, directory path @param checkdir_relative: repolevel determined path @param xpkg: the current package being checked - @returns: dictionary including {eadded} + @returns: boolean ''' checkdir = kwargs.get('checkdir') checkdir_relative = kwargs.get('checkdir_relative') xpkg = kwargs.get('xpkg') if self.check_not_added: self.vcs_settings.status.check(checkdir, checkdir_relative, xpkg) - # update the dynamic data - dyn_eadded = kwargs.get('eadded') - dyn_eadded.set(self.vcs_settings.status.eadded) return False @property diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 508fedb..73187e9 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -180,7 +180,6 @@ class Scanner(object): self.repolevel, self.reposplit, self.categories)) self.pkgs = None - self.eadded = False # Create our kwargs dict here to initialize the plugins with self.kwargs = { @@ -285,7 +284,6 @@ class Scanner(object): logging.info("checking package %s", xpkg) # save memory by discarding xmatch caches from previous package(s) self.caches['arch_xmatch'].clear() - self.eadded = [] catdir, pkgdir = xpkg.split("/") checkdir = self.repo_settings.repodir + "/" + xpkg checkdir_relative = ""