| 1 |
commit: 3627dbfb635921f285083432e8b704b31c5a688a |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 23:15:15 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 20:08:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3627dbfb |
| 7 |
|
| 8 |
emaint: declare handler name consistently across modules |
| 9 |
|
| 10 |
pym/portage/emaint/modules/binhost/binhost.py | 2 +- |
| 11 |
pym/portage/emaint/modules/config/config.py | 8 ++++---- |
| 12 |
pym/portage/emaint/modules/logs/logs.py | 2 +- |
| 13 |
pym/portage/emaint/modules/move/move.py | 6 ++++-- |
| 14 |
pym/portage/emaint/modules/resume/resume.py | 2 +- |
| 15 |
pym/portage/emaint/modules/world/world.py | 2 +- |
| 16 |
6 files changed, 12 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/emaint/modules/binhost/binhost.py b/pym/portage/emaint/modules/binhost/binhost.py |
| 19 |
index 527b02fb3..ebcc9054f 100644 |
| 20 |
--- a/pym/portage/emaint/modules/binhost/binhost.py |
| 21 |
+++ b/pym/portage/emaint/modules/binhost/binhost.py |
| 22 |
@@ -19,9 +19,9 @@ class BinhostHandler(object): |
| 23 |
|
| 24 |
short_desc = "Generate a metadata index for binary packages" |
| 25 |
|
| 26 |
+ @staticmethod |
| 27 |
def name(): |
| 28 |
return "binhost" |
| 29 |
- name = staticmethod(name) |
| 30 |
|
| 31 |
def __init__(self): |
| 32 |
eroot = portage.settings['EROOT'] |
| 33 |
|
| 34 |
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py |
| 35 |
index a05a3c2c7..a0d56992c 100644 |
| 36 |
--- a/pym/portage/emaint/modules/config/config.py |
| 37 |
+++ b/pym/portage/emaint/modules/config/config.py |
| 38 |
@@ -10,14 +10,14 @@ class CleanConfig(object): |
| 39 |
|
| 40 |
short_desc = "Discard any no longer installed configs from emerge's tracker list" |
| 41 |
|
| 42 |
+ @staticmethod |
| 43 |
+ def name(): |
| 44 |
+ return "cleanconfmem" |
| 45 |
+ |
| 46 |
def __init__(self): |
| 47 |
self._root = portage.settings["ROOT"] |
| 48 |
self.target = os.path.join(portage.settings["EROOT"], PRIVATE_PATH, 'config') |
| 49 |
|
| 50 |
- def name(): |
| 51 |
- return "cleanconfmem" |
| 52 |
- name = staticmethod(name) |
| 53 |
- |
| 54 |
def load_configlist(self): |
| 55 |
return grabdict(self.target) |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/pym/portage/emaint/modules/logs/logs.py b/pym/portage/emaint/modules/logs/logs.py |
| 59 |
index dfe0ef0a4..97b45475d 100644 |
| 60 |
--- a/pym/portage/emaint/modules/logs/logs.py |
| 61 |
+++ b/pym/portage/emaint/modules/logs/logs.py |
| 62 |
@@ -18,9 +18,9 @@ class CleanLogs(object): |
| 63 |
|
| 64 |
short_desc = "Clean PORT_LOGDIR logs" |
| 65 |
|
| 66 |
+ @staticmethod |
| 67 |
def name(): |
| 68 |
return "logs" |
| 69 |
- name = staticmethod(name) |
| 70 |
|
| 71 |
|
| 72 |
def can_progressbar(self, func): |
| 73 |
|
| 74 |
diff --git a/pym/portage/emaint/modules/move/move.py b/pym/portage/emaint/modules/move/move.py |
| 75 |
index 1c2636dac..4e505ceee 100644 |
| 76 |
--- a/pym/portage/emaint/modules/move/move.py |
| 77 |
+++ b/pym/portage/emaint/modules/move/move.py |
| 78 |
@@ -167,9 +167,10 @@ class MoveInstalled(MoveHandler): |
| 79 |
|
| 80 |
short_desc = "Perform package move updates for installed packages" |
| 81 |
|
| 82 |
+ @staticmethod |
| 83 |
def name(): |
| 84 |
return "moveinst" |
| 85 |
- name = staticmethod(name) |
| 86 |
+ |
| 87 |
def __init__(self): |
| 88 |
eroot = portage.settings['EROOT'] |
| 89 |
MoveHandler.__init__(self, portage.db[eroot]["vartree"], portage.db[eroot]["porttree"]) |
| 90 |
@@ -178,9 +179,10 @@ class MoveBinary(MoveHandler): |
| 91 |
|
| 92 |
short_desc = "Perform package move updates for binary packages" |
| 93 |
|
| 94 |
+ @staticmethod |
| 95 |
def name(): |
| 96 |
return "movebin" |
| 97 |
- name = staticmethod(name) |
| 98 |
+ |
| 99 |
def __init__(self): |
| 100 |
eroot = portage.settings['EROOT'] |
| 101 |
MoveHandler.__init__(self, portage.db[eroot]["bintree"], portage.db[eroot]['porttree']) |
| 102 |
|
| 103 |
diff --git a/pym/portage/emaint/modules/resume/resume.py b/pym/portage/emaint/modules/resume/resume.py |
| 104 |
index 0d65d4181..580643b26 100644 |
| 105 |
--- a/pym/portage/emaint/modules/resume/resume.py |
| 106 |
+++ b/pym/portage/emaint/modules/resume/resume.py |
| 107 |
@@ -8,9 +8,9 @@ class CleanResume(object): |
| 108 |
|
| 109 |
short_desc = "Discard emerge --resume merge lists" |
| 110 |
|
| 111 |
+ @staticmethod |
| 112 |
def name(): |
| 113 |
return "cleanresume" |
| 114 |
- name = staticmethod(name) |
| 115 |
|
| 116 |
def check(self, **kwargs): |
| 117 |
onProgress = kwargs.get('onProgress', None) |
| 118 |
|
| 119 |
diff --git a/pym/portage/emaint/modules/world/world.py b/pym/portage/emaint/modules/world/world.py |
| 120 |
index ebc3adcbb..d142c3dda 100644 |
| 121 |
--- a/pym/portage/emaint/modules/world/world.py |
| 122 |
+++ b/pym/portage/emaint/modules/world/world.py |
| 123 |
@@ -9,9 +9,9 @@ class WorldHandler(object): |
| 124 |
|
| 125 |
short_desc = "Fix problems in the world file" |
| 126 |
|
| 127 |
+ @staticmethod |
| 128 |
def name(): |
| 129 |
return "world" |
| 130 |
- name = staticmethod(name) |
| 131 |
|
| 132 |
def __init__(self): |
| 133 |
self.invalid = [] |
Archives