From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci plone-custom/conga_ajax.js site/luc ...
Date: 8 Aug 2007 21:26:37 -0000 [thread overview]
Message-ID: <20070808212637.4818.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-08-08 21:26:37
Modified files:
luci/plone-custom: conga_ajax.js
luci/site/luci/Extensions: FenceHandler.py cluster_adapters.py
Log message:
sync with RHEL5 branch
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga_ajax.js.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.265&r2=1.266
--- conga/luci/plone-custom/conga_ajax.js 2007/08/08 21:00:07 1.2
+++ conga/luci/plone-custom/conga_ajax.js 2007/08/08 21:26:37 1.3
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var xmlHttp_object = false;
function initiate_async_get(url, callback_function) {
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/07/27 16:43:47 1.21
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/08/08 21:26:37 1.22
@@ -246,7 +246,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/08/08 21:00:07 1.265
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/08/08 21:26:37 1.266
@@ -2136,7 +2136,7 @@
host_list = fvars['__NODE_HOSTNAME__']
if not host_list:
- return (False, { 'errors': [ 'No cluster node addresses were given', '%r' % request.form ]})
+ return (False, { 'errors': [ 'No cluster node addresses were given' ]})
baseurl = fvars['URL'] or LUCI_CLUSTER_BASE_URL
reply other threads:[~2007-08-08 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070808212637.4818.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.