backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/exporter/exportLib.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit aafc6ca94b190e08f72ff9be20635732f9c37679
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Sep 14 17:14:36 2012 +0200
exporter: honor sync-date / rhn-date when exporting erratas
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index aed6d87..e87c44c 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -288,7 +288,10 @@ class _ChannelDumper(BaseRowDumper):
# Errata information (with timestamps)
query_args = {'channel_id': channel_id}
if self.start_date:
- query = self._query__get_errata_ids_by_limits
+ if self.use_rhn_date:
+ query = self._query__get_errata_ids_by_rhnlimits
+ else:
+ query = self._query__get_errata_ids_by_limits
query_args.update({'lower_limit': self.start_date,
'upper_limit': self.end_date})
else:
11 years, 7 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4f306ada70105e873d126e3ff5129acbcbcc04b7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 14:45:20 2012 +0200
Checkstyle fix.
Addressing
Starting audit...
/builddir/build/BUILD/spacewalk-java-1.8.146/./code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java:53:9: '}' should be alone on a line.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
index 8b3cfdf..581aeac 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
@@ -50,7 +50,8 @@ public class ProbeList extends BaseListAction {
String stateparam = rctx.getParam(PROBE_STATE, false);
if (StringUtils.isEmpty(stateparam)) {
stateparam = "all";
- } else {
+ }
+ else {
rctx.getRequest().setAttribute(PROBE_STATE, stateparam);
}
stateparam = stateparam.toLowerCase();
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.146-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.146-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-14 12:16 +0000
Tagging package [spacewalk-java] version [1.8.146-1] in directory [java/].
Changes since spacewalk-backend-1.8.67-1:
Jan Pazdziora (3):
The server/rhnKickstart does not seem to be imported by any code, removing.
Convert TIMESTAMP WITH LOCAL TIME ZONE as well.
Automatic commit of package [spacewalk-java] release [1.8.146-1].
Tomas Lestach (1):
737895 - remember probe state when paginate
---
backend/server/Makefile | 1
backend/server/rhnKickstart.py | 214 ----------
backend/spacewalk-backend.spec | 1
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 1
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java | 2
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 1
java/spacewalk-java.spec | 10
rel-eng/packages/spacewalk-java | 2
8 files changed, 14 insertions(+), 218 deletions(-)
---
11 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.8.68-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.68-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-14 12:16 +0000
Tagging package [spacewalk-backend] version [1.8.68-1] in directory [backend/].
Changes since spacewalk-backend-1.8.67-1:
Jan Pazdziora (4):
The server/rhnKickstart does not seem to be imported by any code, removing.
Convert TIMESTAMP WITH LOCAL TIME ZONE as well.
Automatic commit of package [spacewalk-java] release [1.8.146-1].
Automatic commit of package [spacewalk-backend] release [1.8.68-1].
Tomas Lestach (1):
737895 - remember probe state when paginate
---
backend/server/Makefile | 1
backend/server/rhnKickstart.py | 214 ----------
backend/spacewalk-backend.spec | 6
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 1
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java | 2
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 1
java/spacewalk-java.spec | 10
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
9 files changed, 19 insertions(+), 220 deletions(-)
---
11 years, 7 months
2 commits - backend/spacewalk-backend.spec java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 24f04a830a5dbdfa7103e1475452aef270e7eca6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 14:16:50 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.68-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index f6345bc..e6c9331 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.67
+Version: 1.8.68
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Sep 14 2012 Jan Pazdziora 1.8.68-1
+- The server/rhnKickstart does not seem to be imported by any code, removing.
+
* Fri Sep 14 2012 Jan Pazdziora 1.8.67-1
- Now that the Oracle columns are of type TIMESTAMP WITH LOCAL TIME ZONE,
nls_timestamp_format is needed as well.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d8d35ad..3d8bc5d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.67-1 backend/
+1.8.68-1 backend/
commit 17ea4f5ba907cca8bc6bc2ce18b4325a2fdabb3c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 14:16:44 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.146-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fd3fffc..19b4078 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.145
+Version: 1.8.146
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Sep 14 2012 Jan Pazdziora 1.8.146-1
+- Convert TIMESTAMP WITH LOCAL TIME ZONE as well.
+- 737895 - remember probe state when paginate
+- 856449 - validate session key for system.getSystemCurrencyMultipliers API
+- 856458 - fix system.getSystemCurrencyScores API doc
+- 856553 - display error messages only once on admin/config/GeneralConfig.do
+ page
+
* Wed Sep 12 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.145-1
- 855884 - fixing NumberFormatException
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 19b3d32..fb146bf 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.145-1 java/
+1.8.146-1 java/
11 years, 7 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 9cdf50717d71acac242aaed00eacb15859df86ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 13:59:08 2012 +0200
Convert TIMESTAMP WITH LOCAL TIME ZONE as well.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 1b2cfa4..5333edd 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -777,6 +777,7 @@ public class CachedStatement {
// this : August 23, 2005 12:00:00 AM PDT
// vs the real date: August 23, 2005 1:36:12 PM PDT
if (columnValue instanceof Date ||
+ ("oracle.sql.TIMESTAMPLTZ".equals(columnValue.getClass().getCanonicalName())) ||
("oracle.sql.TIMESTAMPTZ".equals(columnValue.getClass().getCanonicalName()))) {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
return rs.getTimestamp(columnName, cal);
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java | 2 ++
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 1 +
2 files changed, 3 insertions(+)
New commits:
commit a0d4d27827d98a11b8aa7f8907e142eec039f199
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 14 11:27:20 2012 +0200
737895 - remember probe state when paginate
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
index e1c8cbc..8b3cfdf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeList.java
@@ -50,6 +50,8 @@ public class ProbeList extends BaseListAction {
String stateparam = rctx.getParam(PROBE_STATE, false);
if (StringUtils.isEmpty(stateparam)) {
stateparam = "all";
+ } else {
+ rctx.getRequest().setAttribute(PROBE_STATE, stateparam);
}
stateparam = stateparam.toLowerCase();
// Add all/warning/ok/Class css classname
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 1dcbdc7..52b25c6 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -28,6 +28,7 @@
<form method="POST" name="rhn_list" action="/rhn/monitoring/ProbeList.do">
<rhn:csrf />
<rhn:submitted />
+ <html:hidden property="state" value="${state}" />
<rhn:list pageList="${requestScope.pageList}" noDataText="monitoring.probes.jsp.noprobes" legend="probes-list">
<rhn:listdisplay exportColumns="id,description,stateString,stateOutputString,lastCheck">
<%@ include file="/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf" %>
11 years, 7 months
backend/server backend/spacewalk-backend.spec
by Jan Pazdziora
backend/server/Makefile | 1
backend/server/rhnKickstart.py | 214 -----------------------------------------
backend/spacewalk-backend.spec | 1
3 files changed, 216 deletions(-)
New commits:
commit 729db2c16b315692b418b6bfb860040ccf1e9134
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 10:30:04 2012 +0200
The server/rhnKickstart does not seem to be imported by any code, removing.
diff --git a/backend/server/Makefile b/backend/server/Makefile
index 13c7576..6773aa7 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -17,7 +17,6 @@ SPACEWALK_FILES = __init__ \
rhnDependency \
rhnAction \
rhnHandler rhnImport rhnMapping rhnLib rhnPackage \
- rhnKickstart \
rhnPackageUpload basePackageUpload rhnRepository \
rhnSession rhnUser rhnVirtualization taskomatic
SUBDIRS = rhnSQL rhnServer action \
diff --git a/backend/server/rhnKickstart.py b/backend/server/rhnKickstart.py
deleted file mode 100644
index 670a392..0000000
--- a/backend/server/rhnKickstart.py
+++ /dev/null
@@ -1,214 +0,0 @@
-#
-# Copyright (c) 2008--2011 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-# common module
-from spacewalk.common.rhnLog import log_debug
-from spacewalk.common.rhnException import rhnFault
-
-# local module
-import rhnSQL, rhnChannel
-
-class Kickstart:
-
- def __init__(self, ks_dict, pkgs):
-
- self.id = ks_dict['id']
- self.label = ks_dict['label']
- self.base_path = ks_dict['base_path']
- self.channel_id = ks_dict['channel_id']
- self.boot_image = ks_dict['boot_image']
- self.pkgs = pkgs
-
- self.files = self._get_files(self.id)
-
- def _get_files(self, tree_id):
-
- files_query = rhnSQL.prepare("""
- SELECT
- relative_filename,
- file_size,
- c.checksum_type,
- c.checksum,
- TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
- FROM rhnKSTreeFile, rhnChecksumViev c
- WHERE kstree_id = :tree_id
- AND checksum_id = c.id
- """)
- files_query.execute(tree_id = tree_id)
-
- file_list = files_query.fetchall_dict()
- if file_list:
- return file_list
- else:
- return []
-
- def delete_tree(self):
-
- delete_query = rhnSQL.prepare("""
- delete from rhnKickstartableTree
- where id = :id
- """)
- delete_query.execute(id = self.id)
-
- update_channel = rhnSQL.Procedure('rhn_channel.update_channel')
- invalidate_ss = 0
-
- update_channel(self.channel_id, invalidate_ss)
-
- def has_file(self, ks_file):
-
- for file in self.files:
- if file['relative_filename'] == ks_file['relative_path'] and \
- file['checksum_type'] == ks_file['checksum_type'] and \
- file['checksum'] == ks_file['checksum'] and \
- file['file_size'] == ks_file['file_size'] and \
- file['last_modified'] == ks_file['last_modified']:
-
- return 1
-
- return 0
-
- def clear_files(self):
-
- clear_files_q = rhnSQL.prepare("""
- delete from rhnKSTreeFile where kstree_id = :kstree_id
- """)
-
- clear_files_q.execute(kstree_id = self.id)
-
- def add_file(self, ks_file):
-
- h = rhnSQL.prepare("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'")
- h.execute()
-
- log_debug(3, 'trying to insert ' + str(self.id) + ' , ' + ks_file['relative_path'] + \
- ' , ' + str(ks_file['checksum_type']) + ':'
- ' , ' + str(ks_file['checksum']) + ' , ' + str(ks_file['file_size']) + \
- ' , ' + ks_file['last_modified'])
-
- insert_file_q = rhnSQL.prepare("""
- insert into rhnKSTreeFile
- (kstree_id, relative_filename, checksum_id, file_size, last_modified)
- values (:kstree_id, :relative_filename, lookup_checksum(:checksum_type, :checksum),
- :file_size, :last_modified)
- """)
- insert_file_q.execute(kstree_id = self.id,
- relative_filename = ks_file['relative_path'],
- checksum_type = ks_file['checksum_type'],
- checksum = ks_file['checksum'],
- file_size = ks_file['file_size'],
- last_modified = ks_file['last_modified'])
-
- update_channel = rhnSQL.Procedure('rhn_channel.update_channel')
- invalidate_ss = 0
-
- update_channel(self.channel_id, invalidate_ss)
-
- # Verifies that all pkgs in the ks tree are actually available in the channel
- # Returns a list of packages not found. If the list is empty, the tree linted
- # successfully.
- def lint_tree(self):
-
- # Get a list of all pkgs in the channel.
- channel_pkgs = rhnChannel.list_packages_path(self.channel_id)
-
- log_debug(3, 'channel_pkgs is ' + str(channel_pkgs))
-
- pkgs_not_found = []
-
- # Walk over each package in the kickstart tree
- for pkg in self.pkgs:
-
- found = 0
-
- # Check the current kickstart package against each package in the channel
- for channel_pkg in channel_pkgs:
-
- # If we find the pkg, set found and break the loop.
- if channel_pkg[0].lower().find(pkg.lower()) > 0:
- found = 1
- break
-
- if found == 0:
- pkgs_not_found.append(pkg)
-
- return pkgs_not_found
-
-
- def commit(self):
- pass
-
-
-def create_tree(ks_label, channel_label, path, boot_image, kstree_type, install_type, pkgs):
-
- channel = rhnChannel.channel_info(channel_label)
-
- if channel is '':
- raise rhnFault(40, 'Could not lookup channel ' + channel_label)
-
- channel_id = channel['id']
-
- create_ks_query = rhnSQL.prepare("""
- insert into rhnKickstartableTree (
- id, org_id, label, base_path, channel_id, boot_image, kstree_type,
- install_type)
- values (
- sequence_nextval('rhn_kstree_id_seq'), :org_id, :label, :base_path, :channel_id,
- :boot_image,
- (select id from rhnKSTreeType where label = :kstree_type),
- (select id from rhnKSInstallType where label = :install_type))
- """)
- create_ks_query.execute(org_id = None,
- label = ks_label,
- base_path = path,
- channel_id = channel_id,
- boot_image = boot_image,
- kstree_type = kstree_type,
- install_type = install_type)
-
- return lookup_tree(ks_label, pkgs)
-
-
-def lookup_tree(ks_label, pkgs):
-
- ks_label_query = rhnSQL.prepare ("""
- SELECT KT.id, KT.label, KT.base_path, KT.channel_id, KT.boot_image,
- KT.org_id, KTT.id AS TREE_TYPE, KTT.label AS TREE_TYPE_LABEL, KTT.name AS TREE_TYPE_NAME,
- KIT.id AS install_type, KIT.label AS install_type_label, KIT.name AS install_type_name,
- C.channel_arch_id, CA.label AS CHANNEL_ARCH_LABEL, CA.name AS CHANNEL_ARCH_NAME
- FROM rhnKSTreeType KTT,
- rhnKSInstallType KIT,
- rhnChannel C,
- rhnChannelArch CA,
- rhnKickstartableTree KT
- WHERE KT.label = :ks_label
- AND KTT.id = KT.kstree_type
- AND KIT.id = KT.install_type
- AND C.id = KT.channel_id
- AND CA.id = C.channel_arch_id
- """)
-
- ks_label_query.execute(ks_label = ks_label)
-
- ks_row = ks_label_query.fetchone_dict()
-
- if ks_row:
- kickstart = Kickstart(ks_row, pkgs)
- return kickstart
- else:
- return None
-
-
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 04c2f02..f6345bc 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -397,7 +397,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/server/rhnAuthPAM.py*
%{pythonrhnroot}/server/rhnCapability.py*
%{pythonrhnroot}/server/rhnChannel.py*
-%{pythonrhnroot}/server/rhnKickstart.py*
%{pythonrhnroot}/server/rhnDependency.py*
%{pythonrhnroot}/server/rhnPackage.py*
%{pythonrhnroot}/server/rhnPackageUpload.py*
11 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.8.67-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.67-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-14 07:29 +0000
Tagging package [spacewalk-backend] version [1.8.67-1] in directory [backend/].
Changes since spacewalk-java-1.8.145-1:
Jan Pazdziora (2):
Now that the Oracle columns are of type TIMESTAMP WITH LOCAL TIME ZONE, nls_timestamp_format is needed as well.
Automatic commit of package [spacewalk-backend] release [1.8.67-1].
Stephen Herr (2):
823551 - gui and text changes for firstboot and rhn_register
823551 - fixing problem with firstboot
Tomas Lestach (3):
856553 - display error messages only once on admin/config/GeneralConfig.do page
856458 - fix system.getSystemCurrencyScores API doc
856449 - validate session key for system.getSystemCurrencyMultipliers API
---
backend/server/importlib/backend.py | 3
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/data/progress.glade | 4
client/rhel/rhn-client-tools/data/rh_register.glade | 396 +++++++---
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 6
client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 4
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 18
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 46 -
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 3
rel-eng/packages/spacewalk-backend | 2
11 files changed, 333 insertions(+), 156 deletions(-)
---
11 years, 7 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/server/importlib/backend.py | 3 +++
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit ae308af4a4198a1b7a9b7ff506e68f27a1a1ff85
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 09:29:22 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.67-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3536849..04c2f02 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.66
+Version: 1.8.67
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -647,6 +647,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Sep 14 2012 Jan Pazdziora 1.8.67-1
+- Now that the Oracle columns are of type TIMESTAMP WITH LOCAL TIME ZONE,
+ nls_timestamp_format is needed as well.
+
* Mon Sep 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.66-1
- spacewalk-backend-libs can break spacewalk-backend < 1.7
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f962d81..d8d35ad 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.66-1 backend/
+1.8.67-1 backend/
commit 693520e51068bdc66d80e39e5495faba460b5c1d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 14 09:28:49 2012 +0200
Now that the Oracle columns are of type TIMESTAMP WITH LOCAL TIME ZONE, nls_timestamp_format is needed as well.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 9332926..3a36e75 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -78,6 +78,9 @@ class Backend:
sth = self.dbmodule.prepare("alter session set nls_date_format ='%s'"
% format)
sth.execute()
+ sth = self.dbmodule.prepare("alter session set nls_timestamp_format ='%s'"
+ % format)
+ sth.execute()
def processCapabilities(self, capabilityHash):
# First figure out which capabilities are already inserted
11 years, 7 months