[PATCH v2][Wok] Change plugins get_list to return only loaded plugins
by Rodrigo Trujillo
When using multiple plugins, it is possible that some plugin has a
problem and is not loaded (like when there is a missing module).
In this cases, Wok is not going to load the plugin in cherrypy
configuration, but plugins API return the missing plugin name.
When this occours, UI becomes broken and it is not possible to use any
other plugin, because Wok UI is blank.
This patch fix this problem, returning only plugins names that were
loaded by Wok.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/model/plugins.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py
index 3a5a89e..85d60b6 100644
--- a/src/wok/model/plugins.py
+++ b/src/wok/model/plugins.py
@@ -19,6 +19,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+import cherrypy
+
from wok.utils import get_enabled_plugins
@@ -27,4 +29,7 @@ class PluginsModel(object):
pass
def get_list(self):
- return [plugin for (plugin, config) in get_enabled_plugins()]
+ # Will only return plugins that were loaded correctly by WOK and are
+ # properly configured in cherrypy
+ return [plugin for (plugin, config) in get_enabled_plugins()
+ if config.get('wok').get('uri') in cherrypy.tree.apps.keys()]
--
2.1.0
8 years, 11 months
[PATCH V5] [Wok] Make run_command log its output into a file.
by pvital@linux.vnet.ibm.com
From: Paulo Vital <pvital(a)linux.vnet.ibm.com>
V4 -> V5:
- Added try/exception to control file IO.
V3 -> V4:
- PEP8 fixes.
V2 -> V3:
- Changed the place of the log_file creation control.
V1 -> V2:
- Removed fixed log file, changing parameter of run_command() method to
accept the path of the log file instead of a boolean.
V1:
Adds the ability of run_command to log the output of a console command into the
file /tmp/wok_tee_log_file, like the "tee" command does.
Using this patch, a command that takes too many time to execute can be monitored
by reading the log file while other tasks are executed.
Paulo Vital (1):
Make run_command log its output into a file.
src/wok/utils.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
--
2.5.0
8 years, 11 months
[PATCH] [Wok] Remove cython requirment from configure.ac
by Lucio Correia
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 692f4ac..d753b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AM_INIT_AUTOMAKE([-Wno-portability])
AM_PATH_PYTHON([2.6])
AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8])
AC_PYTHON_MODULE([unittest])
-AC_PYTHON_MODULE([cython], [fatal])
AC_SUBST([HAVE_PYMOD_UNITTEST])
AC_SUBST([PYTHON_VERSION])
AM_GNU_GETTEXT([external])
--
1.9.1
8 years, 11 months
[PATCH v2] [Kimchi] Fixed minor UI issues when saving edited template
by sguimaraes943@gmail.com
From: samhenri <samuel.guimaraes(a)eldorado.org.br>
samhenri (1):
Fixed minor UI issues when saving edited template
ui/js/src/kimchi.template_edit_main.js | 11 +++++++++++
ui/pages/i18n.json.tmpl | 1 +
ui/pages/template-edit.html.tmpl | 4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
--
1.9.3
8 years, 11 months
[Kimchi] Supress HTTPS certification checking on tests
by Ramon Medeiros
This happens when running python >= 2.7.9.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
tests/run_tests.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in
index 048f986..e92e7d4 100644
--- a/tests/run_tests.sh.in
+++ b/tests/run_tests.sh.in
@@ -55,4 +55,4 @@ done
# ../../../../../ refers to the project root
# ../../../../ refers to wok directory
# ../../../ refers to plugins directory
-PYTHONPATH=../../../../../:../../../../:../../../ $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]}
+PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]}
--
2.1.0
8 years, 11 months
[Kimchi v2] Identify opensuse-LEAP-42.1 ISO
by Ramon Medeiros
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
Changes:
v2:
fix pep8 issues
isoinfo.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/isoinfo.py b/isoinfo.py
index 731c45a..c232fa8 100644
--- a/isoinfo.py
+++ b/isoinfo.py
@@ -111,6 +111,8 @@ iso_dir = [
'openSUSE-DVD-i586-Build0039|openSUSE-DVD-x86_640039'),
('opensuse', '12.2',
'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'),
+ ('opensuse', '42.1',
+ 'openSUSE-Leap-42.1-DVD-x86_64026|openSUSE-Leap-42.1-NET-x86_64026'),
('rhel', '4.8', 'RHEL/4-U8'),
('rhel', lambda m: m.group(2), 'RHEL(-LE)?[_/-](\d+\.\d+)'),
('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'),
--
2.1.0
8 years, 11 months
Aline is out on vacations, Daniel is taking temp maintainership ***use the temp repo*** !
by Daniel Henrique Barboza
Hello everyone,
Aline is out on well deserved vacations. I'll be her replacement while
she's out.
As we did earlier this year, I'll resume her duties in the community
reviewing
and applying patches, but I'll do it so in my fork @ github:
WoK temp repo: https://github.com/danielhb/wok.git
Kimchi temp repo: https://github.com/danielhb/kimchi.git
So, in these 2-3 weeks she's out, use these temp repos to get the latest
changes in Wok and Kimchi. Aline will merge this fork with the official
WoK/Kimchi
repo when she comes back.
All coding standards and best practices she enforces in WoK/Kimchi
contributions
will be enforced by me as well. So no need to worry, but no reason to
get lazy either!
So, long story short, use those 2 temp repos and keep doing the same
thing as
always.
Happy coding!
Daniel
8 years, 11 months
[PATCH] [Wok] Added disabled and readonly states to Bootstrap Select
by sguimaraes943@gmail.com
From: samhenri <samuel.guimaraes(a)eldorado.org.br>
This patch fixes readonly and disabled states for Bootstrap Select elements initialized by selectpicker() in the UI.
You can spot this changes in action when editing a Template if you apply "Fixed minor UI issues when saving edited template".
samhenri (1):
Added disabled and readonly states to Bootstrap Select
ui/css/src/bootstrap-select.custom.scss | 12 ++++++++++++
1 file changed, 12 insertions(+)
--
1.9.3
8 years, 11 months
[PATCH] [Kimchi] Fixed minor UI issues when saving edited template
by sguimaraes943@gmail.com
From: samhenri <samuel.guimaraes(a)eldorado.org.br>
samhenri (1):
Fixed minor UI issues when saving edited template
ui/js/src/kimchi.template_edit_main.js | 11 +++++++++++
ui/pages/i18n.json.tmpl | 2 ++
ui/pages/template-edit.html.tmpl | 4 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
--
1.9.3
8 years, 11 months