[PATCH 0/2] Set the right error messages for Kimchi
Aline Manera (2): Set the right error messages for Kimchi Use absolute import path on root.py src/wok/plugins/kimchi/root.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) -- 2.1.0
Kimchi should use its own error messages otherwise they will not be displayed correctly on an error. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wok/plugins/kimchi/root.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/plugins/kimchi/root.py b/src/wok/plugins/kimchi/root.py index 1e2bfc7..8128c89 100644 --- a/src/wok/plugins/kimchi/root.py +++ b/src/wok/plugins/kimchi/root.py @@ -21,7 +21,7 @@ import json import os import cherrypy -from wok.i18n import messages +from wok.plugins.kimchi.i18n import messages from wok.root import WokRoot import config -- 2.1.0
Reviewed-By: Paulo Vital <pvital@linux.vnet.ibm.com> On Thu, 2015-10-15 at 17:25 -0300, Aline Manera wrote:
Kimchi should use its own error messages otherwise they will not be displayed correctly on an error.
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wok/plugins/kimchi/root.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wok/plugins/kimchi/root.py b/src/wok/plugins/kimchi/root.py index 1e2bfc7..8128c89 100644 --- a/src/wok/plugins/kimchi/root.py +++ b/src/wok/plugins/kimchi/root.py @@ -21,7 +21,7 @@ import json import os import cherrypy
-from wok.i18n import messages +from wok.plugins.kimchi.i18n import messages from wok.root import WokRoot
import config
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wok/plugins/kimchi/root.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/wok/plugins/kimchi/root.py b/src/wok/plugins/kimchi/root.py index 8128c89..9cbc70f 100644 --- a/src/wok/plugins/kimchi/root.py +++ b/src/wok/plugins/kimchi/root.py @@ -21,15 +21,12 @@ import json import os import cherrypy +from wok.plugins.kimchi import config, mockmodel, vnc from wok.plugins.kimchi.i18n import messages +from wok.plugins.kimchi.control import sub_nodes +from wok.plugins.kimchi.model import model as kimchiModel from wok.root import WokRoot -import config -import mockmodel -import vnc -from control import sub_nodes -from model import model as kimchiModel - class KimchiRoot(WokRoot): def __init__(self, wok_options): -- 2.1.0
Reviewed-By: Paulo Vital <pvital@linux.vnet.ibm.com> On Thu, 2015-10-15 at 17:25 -0300, Aline Manera wrote:
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wok/plugins/kimchi/root.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/wok/plugins/kimchi/root.py b/src/wok/plugins/kimchi/root.py index 8128c89..9cbc70f 100644 --- a/src/wok/plugins/kimchi/root.py +++ b/src/wok/plugins/kimchi/root.py @@ -21,15 +21,12 @@ import json import os import cherrypy
+from wok.plugins.kimchi import config, mockmodel, vnc from wok.plugins.kimchi.i18n import messages +from wok.plugins.kimchi.control import sub_nodes +from wok.plugins.kimchi.model import model as kimchiModel from wok.root import WokRoot
-import config -import mockmodel -import vnc -from control import sub_nodes -from model import model as kimchiModel -
class KimchiRoot(WokRoot): def __init__(self, wok_options):
participants (2)
-
Aline Manera -
Paulo Ricardo Paz Vital