backend/server/handlers/config_mgmt/rhn_config_management.py | 1 +
backend/server/rhnServer/server_kickstart.py | 4 ++--
client/tools/osad/src/osa_dispatcher.py | 2 +-
monitoring/SputLite/html/cgi-bin/upload_results.cgi | 1 +
monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi | 4 ++--
5 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 680609864331dca4e96140778d24f0e9908144b9
Author: Michael Calmer <mc(a)suse.de>
Date: Mon Nov 28 16:44:24 2011 +0100
replace sysdate with current_timestamp
diff --git a/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
b/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
index 6a2cea2..c42bcaa 100755
--- a/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
+++ b/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
@@ -151,7 +151,7 @@ if( defined $clusterid ) {
# Update the command_queue_execs table to indicate that the
# satellite has downloaded the commands
- my $rv = $CF_DB->updateCQ_Exec($iid, $clusterid, 'cluster',
['date_accepted = sysdate']);
+ my $rv = $CF_DB->updateCQ_Exec($iid, $clusterid, 'cluster',
['date_accepted = current_timestamp']);
}
}
@@ -164,7 +164,7 @@ if( defined $clusterid ) {
# Update the command_queue_execs table to indicate that the
# satellite has downloaded the commands
- my $rv = $CF_DB->updateCQ_Exec($iid, $nodeid, 'node',
['date_accepted = sysdate']);
+ my $rv = $CF_DB->updateCQ_Exec($iid, $nodeid, 'node',
['date_accepted = current_timestamp']);
}
print "</COMMANDS>\n";
commit cb03309b01f3716967de6f1981502c7b56b99ff7
Author: Michael Calmer <mc(a)suse.de>
Date: Mon Nov 28 17:08:11 2011 +0100
postgres seems to reject empty text for stdout and stderr column
ERROR: new row for relation "rhn_command_queue_execs" violates check
constraint "vn_rhn_command_queue_execs_stderr"
diff --git a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
index 913fa53..cf5794a 100755
--- a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
+++ b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
@@ -113,6 +113,7 @@ sub ProcessInput {
# Truncate to fit into a varchar2(4000)
$value = substr($value, 0, 3996) . '...' if (length($value) > 4000);
+ $value = ' ' if (length($value) == 0);
push(@values, "$field = ?");
push(@bindvars, $value);
commit 2d080850911f3a843bba779fbc6361400a33e90e
Author: Michael Calmer <mc(a)suse.de>
Date: Mon Nov 28 16:13:43 2011 +0100
specify missing param password
diff --git a/client/tools/osad/src/osa_dispatcher.py
b/client/tools/osad/src/osa_dispatcher.py
index 9f207af..967c77b 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -270,7 +270,7 @@ class Runner(jabber_lib.Runner):
""")
def _register_dispatcher(self, jabber_id, hostname, port):
- h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in
varchar', 'port_in numeric', 'jabber_id_in varchar' ))
+ h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in
varchar', 'port_in numeric', 'jabber_id_in varchar', 'password
varchar' ))
h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port,
password=self._password)
rhnSQL.commit()
commit 6643c96a30f66e8c01f87d6cc4d232cb0332c5fd
Author: Michael Calmer <mc(a)suse.de>
Date: Sun Nov 27 15:36:23 2011 +0100
fix typos in boolean variables
E:358,21:schedule_config_deploy: Undefined variable 'false'
E:361,29:schedule_config_deploy: Undefined variable 'true'
diff --git a/backend/server/rhnServer/server_kickstart.py
b/backend/server/rhnServer/server_kickstart.py
index a33389f..7ba167b 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -355,10 +355,10 @@ def schedule_config_deploy(server_id, action_id,
kickstart_session_id,
return aid
else:
tokens_obj = rhnFlags.get("registration_token")
- deployment = false
+ deployment = False
for token in tokens_obj.tokens:
if token['deploy_configs'] == 'Y':
- deployment = true
+ deployment = True
break
if not deployment:
return aid
commit bbde8ea30242852526ff09eaa04a0fdfaf1126a6
Author: Michael Calmer <mc(a)suse.de>
Date: Sun Nov 27 15:35:12 2011 +0100
add missing import
E:132,54:ConfigManagement.management_remove_channel: Undefined variable
'sys'
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py
b/backend/server/handlers/config_mgmt/rhn_config_management.py
index d5287fc..ddf08c4 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -17,6 +17,7 @@
#
# $Id$
+import sys
import difflib
from spacewalk.common.rhnLog import log_debug
from spacewalk.common.rhnException import rhnFault