diff options
Diffstat (limited to '')
-rw-r--r-- | portato/config_parser.py | 2 | ||||
-rw-r--r-- | portato/gui/wrapper.py | 2 | ||||
-rw-r--r-- | portato/plugin.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/portato/config_parser.py b/portato/config_parser.py index 30d5d28..76a022a 100644 --- a/portato/config_parser.py +++ b/portato/config_parser.py @@ -35,7 +35,7 @@ import re from gettext import lgettext as _ from threading import Lock -from .helper import debug +from .helper import debug, error DELIMITER = ["=", ":"] COMMENT = [";","#"] diff --git a/portato/gui/wrapper.py b/portato/gui/wrapper.py index 78a03ab..a7eda08 100644 --- a/portato/gui/wrapper.py +++ b/portato/gui/wrapper.py @@ -125,7 +125,7 @@ class Tree: @rtype: boolean""" raise NotImplementedError - def is_in_emerge (self, it): + def is_in_update (self, it): """Checks whether an iterator is part of the "Update" section. @param it: the iterator to check diff --git a/portato/plugin.py b/portato/plugin.py index b081ecd..ab5564f 100644 --- a/portato/plugin.py +++ b/portato/plugin.py @@ -20,7 +20,7 @@ from lxml import etree from gettext import lgettext as _ from .constants import PLUGIN_DIR, XSD_LOCATION -from .helper import debug, info, error, flatten +from .helper import debug, info, warning, error, flatten class PluginImportException (ImportError): pass @@ -463,7 +463,7 @@ class PluginQueue: # type = "override" elif connect.is_override_type(): if self.hooks[hook.hook][1]: - warn(_("For hook '%(hook)s' an override is already defined by plugin '%(plugin)s'!"), {"hook": hook.hook, "plugin": self.hooks[hook.hook][1][0]}) + warning(_("For hook '%(hook)s' an override is already defined by plugin '%(plugin)s'!"), {"hook": hook.hook, "plugin": self.hooks[hook.hook][1][0]}) self.hooks[hook.hook][1][:1] = [connect] continue @@ -494,7 +494,7 @@ class PluginQueue: resolve(hook, list, idx, add) for l in list: - warn("Command for hook '%(hook)s' in plugin '%(plugin)s' could not be added due to missing dependant: '%(dep)s'!", {"hook": hook, "plugin": l.hook.plugin.name, "dep": l.depend_plugin}) + warning("Command for hook '%(hook)s' in plugin '%(plugin)s' could not be added due to missing dependant: '%(dep)s'!", {"hook": hook, "plugin": l.hook.plugin.name, "dep": l.depend_plugin}) for hook in before: resolve(hook, before[hook], 0, 0) |