| 1 |
commit: 4a0072779d465cb7b0bd9e396e78772c8a45d051 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 25 16:11:42 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 25 16:11:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a007277 |
| 7 |
|
| 8 |
repoman: Clean up some no longer used eadded variables |
| 9 |
|
| 10 |
pym/repoman/modules/scan/status/__init__.py | 1 - |
| 11 |
pym/repoman/modules/scan/status/vcsstatus.py | 5 +---- |
| 12 |
pym/repoman/scanner.py | 2 -- |
| 13 |
3 files changed, 1 insertion(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/repoman/modules/scan/status/__init__.py b/pym/repoman/modules/scan/status/__init__.py |
| 16 |
index 5f30639..1abf580 100644 |
| 17 |
--- a/pym/repoman/modules/scan/status/__init__.py |
| 18 |
+++ b/pym/repoman/modules/scan/status/__init__.py |
| 19 |
@@ -23,7 +23,6 @@ module_spec = { |
| 20 |
'func_kwargs': { |
| 21 |
'checkdir': (None, None), |
| 22 |
'checkdir_relative': (None, None), |
| 23 |
- 'eadded': ('Future', 'UNSET'), |
| 24 |
'xpkg': (None, None), |
| 25 |
}, |
| 26 |
}, |
| 27 |
|
| 28 |
diff --git a/pym/repoman/modules/scan/status/vcsstatus.py b/pym/repoman/modules/scan/status/vcsstatus.py |
| 29 |
index fd56560..ab81a11 100644 |
| 30 |
--- a/pym/repoman/modules/scan/status/vcsstatus.py |
| 31 |
+++ b/pym/repoman/modules/scan/status/vcsstatus.py |
| 32 |
@@ -24,16 +24,13 @@ class VCSStatus(ScanBase): |
| 33 |
@param checkdir: string, directory path |
| 34 |
@param checkdir_relative: repolevel determined path |
| 35 |
@param xpkg: the current package being checked |
| 36 |
- @returns: dictionary including {eadded} |
| 37 |
+ @returns: boolean |
| 38 |
''' |
| 39 |
checkdir = kwargs.get('checkdir') |
| 40 |
checkdir_relative = kwargs.get('checkdir_relative') |
| 41 |
xpkg = kwargs.get('xpkg') |
| 42 |
if self.check_not_added: |
| 43 |
self.vcs_settings.status.check(checkdir, checkdir_relative, xpkg) |
| 44 |
- # update the dynamic data |
| 45 |
- dyn_eadded = kwargs.get('eadded') |
| 46 |
- dyn_eadded.set(self.vcs_settings.status.eadded) |
| 47 |
return False |
| 48 |
|
| 49 |
@property |
| 50 |
|
| 51 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
| 52 |
index 508fedb..73187e9 100644 |
| 53 |
--- a/pym/repoman/scanner.py |
| 54 |
+++ b/pym/repoman/scanner.py |
| 55 |
@@ -180,7 +180,6 @@ class Scanner(object): |
| 56 |
self.repolevel, self.reposplit, self.categories)) |
| 57 |
|
| 58 |
self.pkgs = None |
| 59 |
- self.eadded = False |
| 60 |
|
| 61 |
# Create our kwargs dict here to initialize the plugins with |
| 62 |
self.kwargs = { |
| 63 |
@@ -285,7 +284,6 @@ class Scanner(object): |
| 64 |
logging.info("checking package %s", xpkg) |
| 65 |
# save memory by discarding xmatch caches from previous package(s) |
| 66 |
self.caches['arch_xmatch'].clear() |
| 67 |
- self.eadded = [] |
| 68 |
catdir, pkgdir = xpkg.split("/") |
| 69 |
checkdir = self.repo_settings.repodir + "/" + xpkg |
| 70 |
checkdir_relative = "" |
Archives