[conga-luci-1stgen] RHEL5-active: bz514679: fix incorrect copyright info with non-English locale (bf990a1)
by Jan Pokorný
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : RHEL5-active
>---------------------------------------------------------------
commit bf990a15a416a1e9a1448ae34acbefe5025e85e5
Author: Jan Pokorný <jpokorny(a)redhat.com>
Date: Tue May 28 21:04:36 2013 +0200
bz514679: fix incorrect copyright info with non-English locale
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
>---------------------------------------------------------------
.../redef-plone-used/plone_templates/footer | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/luci/plone-custom/redef-plone-used/plone_templates/footer b/luci/plone-custom/redef-plone-used/plone_templates/footer
index e9811df..c408d47 100644
--- a/luci/plone-custom/redef-plone-used/plone_templates/footer
+++ b/luci/plone-custom/redef-plone-used/plone_templates/footer
@@ -3,7 +3,7 @@
<div id="portal-footer" metal:define-macro="portal_footer">
<p>
- <span i18n:translate="description_copyright" tal:omit-tag="">
+ <span i18n:translate="" tal:omit-tag="">
The
<span>
<a href="http://www.sourceware.org/cluster/conga">
10 years, 11 months
[conga-luci-1stgen] RHEL5-active: luci: Fix for uncaught exception caused by deep recursion (1471a1a)
by Ryan McCabe
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : RHEL5-active
>---------------------------------------------------------------
commit 1471a1a51bc483ec0a54a7f0f0abfbd04e401c31
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Tue May 28 14:53:45 2013 -0400
luci: Fix for uncaught exception caused by deep recursion
This fixes an uncaught RuntimeError exception that was caused by deep
recursion that occurred when using an extremely large cluster.conf file.
Resolves: rhbz#872645
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
>---------------------------------------------------------------
luci/cluster/index_html | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/luci/cluster/index_html b/luci/cluster/index_html
index 7970566..fca475f 100644
--- a/luci/cluster/index_html
+++ b/luci/cluster/index_html
@@ -140,10 +140,6 @@
<tal:block tal:condition="python: ri_agent">
<tal:block tal:define="
global modelb python:here.getmodelbuilder(ri_agent, isVirtualized)" />
- <tal:block tal:condition="python: modelb">
- <tal:block
- tal:define="dummy python: here.appendModel(request, modelb)" />
- </tal:block>
</tal:block>
</tal:block>
10 years, 11 months
[conga-luci-1stgen] RHEL5-active: luci: Don't chkconfig system services on when starting cluster nodes (38fec59)
by Ryan McCabe
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : RHEL5-active
>---------------------------------------------------------------
commit 38fec59c2e055ff104687ef6f0d62e14705423f4
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Tue May 28 14:55:10 2013 -0400
luci: Don't chkconfig system services on when starting cluster nodes
Luci previously enabled cluster services on boot, even if they had been
disabled explicitly. This patch causes luci to leave chkconfig settings
as they are when a user starts a cluster node from luci.
Resolves: rhbz#887170
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
>---------------------------------------------------------------
luci/site/luci/Extensions/LuciClusterActions.py | 6 +++---
luci/site/luci/Extensions/RicciQueries.py | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/luci/site/luci/Extensions/LuciClusterActions.py b/luci/site/luci/Extensions/LuciClusterActions.py
index 87b7dcf..6acc148 100644
--- a/luci/site/luci/Extensions/LuciClusterActions.py
+++ b/luci/site/luci/Extensions/LuciClusterActions.py
@@ -202,9 +202,9 @@ def NodeJoinCluster(self,
rc,
clustername,
nodename_resolved,
- enable_services=True):
+ enable_services=False):
- batch_number, result = rq.nodeJoinCluster(rc, enable_services=enable_services)
+ batch_number, result = rq.nodeJoinCluster(rc, enable_services)
if batch_number is None or result is None:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('NJ0: batch_number and/or result is None')
@@ -458,7 +458,7 @@ def ClusterStart(self, model):
errors += 1
continue
- if NodeJoinCluster(self, rc, clustername, nodename_resolved, enable_services=True) is None:
+ if NodeJoinCluster(self, rc, clustername, nodename_resolved) is None:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('CStart1: nodeJoin %s' \
% nodename_resolved)
diff --git a/luci/site/luci/Extensions/RicciQueries.py b/luci/site/luci/Extensions/RicciQueries.py
index 1d9bd94..58333fc 100644
--- a/luci/site/luci/Extensions/RicciQueries.py
+++ b/luci/site/luci/Extensions/RicciQueries.py
@@ -457,13 +457,14 @@ def nodeFence(rc, nodename):
ricci_xml = rc.batch_run(batch_str)
return batchAttemptResult(ricci_xml)
-def nodeJoinCluster(rc, cluster_startup=False, enable_services=True):
+def nodeJoinCluster(rc, cluster_startup=False, enable_services=False):
cstartup = 'false'
if cluster_startup is True:
cstartup = 'true'
- enable_services = 'true'
- if enable_services is False:
+ if enable_services:
+ enable_services = 'true'
+ else:
enable_services = 'false'
batch_str = '<module name="cluster"><request API_version="1.0"><function_call name="start_node"><var mutable="false" name="cluster_startup" type="boolean" value="%s"/><var mutable="false" name="enable_services" type="boolean" value="%s"/></function_call></request></module>' % (cstartup, enable_services)
10 years, 11 months
[conga-luci-1stgen] RHEL5-active: luci/MAINTAINERS.rst: update debug how to (25fffeb)
by Jan Pokorný
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : RHEL5-active
>---------------------------------------------------------------
commit 25fffebc9e6e35b6d500120347c0331c716d4921
Author: Jan Pokorný <jpokorny(a)redhat.com>
Date: Tue May 28 10:39:28 2013 +0200
luci/MAINTAINERS.rst: update debug how to
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
>---------------------------------------------------------------
luci/MAINTAINERS.rst | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/luci/MAINTAINERS.rst b/luci/MAINTAINERS.rst
index df90979..365e656 100644
--- a/luci/MAINTAINERS.rst
+++ b/luci/MAINTAINERS.rst
@@ -35,6 +35,18 @@ into respective code; for instance::
This way, the Python debugger will take the control when running into
such points in the code.
+More elegant solution may be to run luci from `zopectl` like this::
+ zopectl> debug
+ Starting debugger (the name "app" is bound to the top-level Zope object)
+ [...]
+ >>> Zope2.debug('/luci', d=True)
+ * Type "s<cr>c<cr>" to jump to beginning of real publishing process.
+ * Then type c<cr> to jump to the beginning of the URL traversal
+ algorithm.
+ * Then type c<cr> to jump to published object call.
+ > <string>(1)?()
+ pdb>
+
How to enable and access ZMI
============================
10 years, 11 months
[conga-luci-1stgen] master: README: fix another typo (b1dab98)
by Jan Pokorný
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : master
>---------------------------------------------------------------
commit b1dab98e3c78aa01916c2ba29b949b60d444947f
Author: Jan Pokorný <jpokorny(a)redhat.com>
Date: Thu May 23 11:41:11 2013 +0200
README: fix another typo
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
>---------------------------------------------------------------
README | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/README b/README
index 53fbae5..97f3550 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ CVS-GIT mapping details
Usernames of committers should be gracefully converted into names
in full + emails as usual with GIT (-A ../author-conv-file).
-Underscoures in tags should be converted nicely into dots (-u).
+Underscores in tags should be converted nicely into dots (-u).
HEAD branch from CVS is imported to the "origin" branch (default).
The branches are:
10 years, 11 months
[conga-luci-1stgen] RHEL5-active: ricci: Fix for stack overflow caused by very large cluster.conf files (0e87f04)
by Ryan McCabe
Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git
On branch : RHEL5-active
>---------------------------------------------------------------
commit 0e87f04db5ec9f3f52286dd3730722ba4bddff88
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Tue May 21 13:49:01 2013 -0400
ricci: Fix for stack overflow caused by very large cluster.conf files
Fix for a crash that occurs when reading very large cluster.conf files.
Fix by Jan Pokorny <jpokorny(a)redhat.com>
Resolves: rhbz#965785
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
>---------------------------------------------------------------
ricci/common/File.cpp | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ricci/common/File.cpp b/ricci/common/File.cpp
index 1099250..c004dd5 100644
--- a/ricci/common/File.cpp
+++ b/ricci/common/File.cpp
@@ -138,18 +138,28 @@ File::read() const
{
MutexLocker l(*_mutex);
+ char *buff = NULL;
long len = size();
- char buff[len];
+
try {
+ buff = new char[len];
+
((fstream *) _pimpl->fs)->seekg(0, ios::beg);
- check_failed();
((fstream *) _pimpl->fs)->read(buff, len);
check_failed();
+ if (len != ((fstream *) _pimpl->fs)->gcount())
+ throw String("Read size mismatch: ") + _path;
String ret(buff, len);
+
::shred(buff, len);
+ delete[] buff;
+
return ret;
} catch ( ... ) {
- ::shred(buff, len);
+ if (buff) {
+ ::shred(buff, len);
+ delete[] buff;
+ }
throw;
}
}
10 years, 11 months