Changes to 'refs/tags/spacewalk-schema-1.10.28-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.28-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-05-02 13:51 +0000
Tagging package [spacewalk-schema] version [1.10.28-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.10.27-1:
Michael Mraka (2):
fixed wrong sha1
Automatic commit of package [spacewalk-schema] release [1.10.28-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 12 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 53fe1fa0ba5c769e48fbd34dc9a4deebf5b363f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 2 15:51:54 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.28-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 176dfa7..6433f03 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.27-1 schema/spacewalk/
+1.10.28-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index e83bf8e..be4bb36 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.27
+Version: 1.10.28
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu May 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.28-1
+- fixed wrong sha1
+
* Thu May 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.27-1
- columns can be altered with values inside
commit fc9e92a70f69c2a73d64b27451414edb795a5ab3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 2 15:50:54 2013 +0200
fixed wrong sha1
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql
index 5765c75..9aec522 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.postgresql
@@ -1,2 +1,2 @@
--- oracle equivalent source sha1 7e93ddeca007726e80667ecf9bf1559518fa9819
+-- oracle equivalent source sha1 8c59160543d79ba4f93a1eeafc2586d025c5dc5a
-- This file is intentionally left empty.
10 years, 12 months
Changes to 'refs/tags/spacewalk-schema-1.10.27-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-05-02 13:22 +0000
Tagging package [spacewalk-schema] version [1.10.27-1] in directory [schema/spacewalk/].
Changes since rhnlib-2.5.59-1:
Michael Mraka (2):
columns can be altered with values inside
Automatic commit of package [spacewalk-schema] release [1.10.27-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle | 83 ----------
3 files changed, 5 insertions(+), 85 deletions(-)
---
10 years, 12 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle | 83 ----------
3 files changed, 5 insertions(+), 85 deletions(-)
New commits:
commit 5cb5811204a434a9c9d23b9096525045e7f88e6f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 2 15:22:07 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.27-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3e4417a..176dfa7 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.26-1 schema/spacewalk/
+1.10.27-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 3463893..e83bf8e 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.26
+Version: 1.10.27
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu May 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.27-1
+- columns can be altered with values inside
+
* Mon Apr 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.26-1
- fixed dependency
commit b2428015353d91a091b2af779fc2b0ccc657a95a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 10:36:00 2013 +0200
columns can be altered with values inside
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle
index 9647876..89a8aaf 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/132-tables-timestamps.sql.oracle
@@ -1,41 +1,4 @@
-
-begin
- for rec in (
- select trigger_name
- from user_triggers
- where table_name in (
- select table_name
- from user_tab_columns
- where DATA_TYPE = 'DATE'
- )
- and trigger_name not like '%$%'
- ) loop
- execute immediate 'alter trigger ' || rec.trigger_name || ' disable';
- end loop;
-end;
-/
-
-begin
- for rec in (
- select table_name, constraint_name
- from user_constraints
- where table_name in (
- select table_name
- from user_tab_columns
- where DATA_TYPE = 'DATE'
- )
- and table_name not like '%$%'
- and constraint_type = 'C'
- ) loop
- execute immediate 'alter table ' || rec.table_name || ' disable constraint ' || rec.constraint_name;
- end loop;
-end;
-/
-
-declare
- prev_table varchar2(30);
begin
- prev_table := 'none';
for rec in (
select table_name, column_name
from user_tab_columns
@@ -47,22 +10,9 @@ begin
and data_type = 'DATE'
order by table_name
) loop
- if prev_table <> rec.table_name then
- if prev_table <> 'none' then
- execute immediate 'alter table ' || prev_table || ' drop column orig_date';
- end if;
- execute immediate 'alter table ' || rec.table_name || ' add orig_date date';
- end if;
- execute immediate 'update ' || rec.table_name || ' set orig_date = ' || rec.column_name;
- execute immediate 'update ' || rec.table_name || ' set ' || rec.column_name || ' = null';
execute immediate 'alter table ' || rec.table_name || ' modify ' || rec.column_name || ' timestamp with local time zone';
- execute immediate 'update ' || rec.table_name || ' set ' || rec.column_name || ' = orig_date';
- prev_table := rec.table_name;
end loop;
- if prev_table <> 'none' then
- execute immediate 'alter table ' || prev_table || ' drop column orig_date';
- end if;
end;
/
@@ -81,36 +31,3 @@ begin
end;
/
-begin
- for rec in (
- select table_name, constraint_name
- from user_constraints
- where table_name in (
- select table_name
- from user_tab_columns
- where DATA_TYPE = 'TIMESTAMP(6) WITH LOCAL TIME ZONE'
- )
- and table_name not like '%$%'
- and constraint_type = 'C'
- ) loop
- execute immediate 'alter table ' || rec.table_name || ' enable constraint ' || rec.constraint_name;
- end loop;
-end;
-/
-
-begin
- for rec in (
- select trigger_name
- from user_triggers
- where table_name in (
- select table_name
- from user_tab_columns
- where DATA_TYPE = 'TIMESTAMP(6) WITH LOCAL TIME ZONE'
- )
- and trigger_name not like '%$%'
- ) loop
- execute immediate 'alter trigger ' || rec.trigger_name || ' enable';
- end loop;
-end;
-/
-
10 years, 12 months
Changes to 'refs/tags/rhnlib-2.5.59-1'
by StephenHerr
Tag 'rhnlib-2.5.59-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-05-02 12:59 +0000
Tagging package [rhnlib] version [2.5.59-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-backend-1.10.25-1:
Stephen Herr (2):
947639 - new rhnlib conflicts with old spacewalk-backend
Automatic commit of package [rhnlib] release [2.5.59-1].
---
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 12 months
2 commits - client/rhel rel-eng/packages
by StephenHerr
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 301ed32331269aa7b9fb13e723cac192165634bd
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu May 2 08:59:30 2013 -0400
Automatic commit of package [rhnlib] release [2.5.59-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index b5d46b9..04c69df 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.58
+Version: 2.5.59
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Thu May 02 2013 Stephen Herr <sherr(a)redhat.com> 2.5.59-1
+- 947639 - new rhnlib conflicts with old spacewalk-backend
+
* Tue Apr 09 2013 Stephen Herr <sherr(a)redhat.com> 2.5.58-1
- 947639 - rhnlib update made necessary by error in rhncfg
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index ae0d829..1134ffa 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.58-1 client/rhel/rhnlib/
+2.5.59-1 client/rhel/rhnlib/
commit c79cb9bbc5c4efb8ef46398db37acadb925eaa9e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu May 2 08:59:25 2013 -0400
947639 - new rhnlib conflicts with old spacewalk-backend
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 7e103b4..b5d46b9 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -24,6 +24,7 @@ Conflicts: rhn-custom-info < 5.4.7
Conflicts: rhnpush < 5.5.10
Conflicts: rhnclient < 0.10
Conflicts: spacewalk-proxy < 1.3.6
+Conflicts: spacewalk-backend < 1.10.25
%description
rhnlib is a collection of python modules used by the
10 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.10.25-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.25-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-05-02 12:50 +0000
Tagging package [spacewalk-backend] version [1.10.25-1] in directory [backend/].
Changes since cobbler-loaders-1.0.2-1:
Grant Gainey (1):
Tweak create-page to know about StrutsDelegate
Simon Lukasik (2):
958654 - Use different listSetName for the XccdfDetail page.
Print stack trace in case of CSV failures.
Stephen Herr (2):
947639 - make satellite-sync work with new rhnlib
Automatic commit of package [spacewalk-backend] release [1.10.25-1].
---
backend/satellite_tools/connection.py | 7 +++++--
backend/spacewalk-backend.spec | 5 ++++-
java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java | 1 +
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 4 ++--
java/scripts/java-create-page.pl | 2 +-
java/scripts/java-templates/actionbody.txt | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
7 files changed, 15 insertions(+), 8 deletions(-)
---
10 years, 12 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/satellite_tools/connection.py | 7 +++++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit ce7a85bc9bd513bed764bee5aa7a2da882198265
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu May 2 08:50:14 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1931638..3dbb533 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.10.24
+Version: 1.10.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu May 02 2013 Stephen Herr <sherr(a)redhat.com> 1.10.25-1
+- 947639 - make satellite-sync work with new rhnlib
+
* Mon Apr 29 2013 Stephen Herr <sherr(a)redhat.com> 1.10.24-1
- Revert "Run python backend in daemon mode to ease integration with splice"
- Revert "Additional change for spacewalk-backend daemon mode"
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 5af7d8c..e047e3a 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.24-1 backend/
+1.10.25-1 backend/
commit b5005ff67e10176e49f4957eb65a0b98c72e2bd9
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu May 2 08:50:01 2013 -0400
947639 - make satellite-sync work with new rhnlib
diff --git a/backend/satellite_tools/connection.py b/backend/satellite_tools/connection.py
index 45a8c50..2a2076d 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -25,8 +25,11 @@ __version__ = "0.1"
class Transport(rpclib.transports.Transport):
user_agent = "satellite-sync/%s" % __version__
- def __init__(self):
- rpclib.transports.Transport.__init__(self)
+ def __init__(self, timeout=None):
+ if timeout:
+ rpclib.transports.Transport.__init__(self, timeout=timeout)
+ else:
+ rpclib.transports.Transport.__init__(self)
self.add_header("Accept-Encoding", "gzip")
def _process_response(self, fd, connection):
10 years, 12 months
2 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java | 1 +
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b1620358d214a00ed6c0eae93ff362e669bb8d9e
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 2 09:12:48 2013 +0200
Print stack trace in case of CSV failures.
Even though there is a polite error page for CSV failures,
the stack trace may turn out to be more helpful.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
index 1cca361..fb9e21d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
@@ -67,6 +67,7 @@ public class CSVDownloadAction extends DownloadAction {
* Overridden to redirect for case of errors while processing CSV Export,
* example: Session timeout.
*/
+ e.printStackTrace();
return mapping.findForward("error");
}
return null;
commit ff626d1210bfd3587dfbf3a1e58da7328e3d6bb1
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 2 08:02:24 2013 +0200
958654 - Use different listSetName for the XccdfDetail page.
The list on XccdfDetails page does not have any elaborator
and the list allows the export to CSV. However, when there
was another page with the same listSetName and this page
had bound elaborator to this name --> Our CSV export will
try to evaluate this elaborator.
Such bug may easily remain unnoticed, as the majority of
elaborators use the 'id' attribute. Unfortunatelly, this
one used 'xid'.
Addressing:
com.redhat.rhn.common.db.datasource.MapColumnNotFoundException: Column, xid, not found in driving query results
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:391)
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaborator(CachedStatement.java:363)
at com.redhat.rhn.common.db.datasource.SelectMode.elaborate(SelectMode.java:164)
at com.redhat.rhn.common.db.datasource.ModeElaborator.elaborate(ModeElaborator.java:48)
at com.redhat.rhn.frontend.action.CSVDownloadAction.getStreamInfo(CSVDownloadAction.java:201)
at org.apache.struts.actions.DownloadAction.execute(DownloadAction.java:104)
at com.redhat.rhn.frontend.action.CSVDownloadAction.execute(CSVDownloadAction.java:66)
at org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:425)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:228)
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 43e5673..0b83133 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -86,7 +86,7 @@
<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2>
-<rl:listset name="groupSet">
+<rl:listset name="xccdfDetails">
<rhn:csrf/>
<rl:list>
<rl:decorator name="PageSizeDecorator"/>
@@ -94,7 +94,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
</rl:list>
- <rl:csv name="groupSet"
+ <rl:csv name="xccdfDetails"
exportColumns="id,documentIdref,identsString,evaluationResult"/>
</rl:listset>
10 years, 12 months
java/scripts
by Grant Gainey
java/scripts/java-create-page.pl | 2 +-
java/scripts/java-templates/actionbody.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5d97c869b2028923821e23e199bef57ab92ae4f9
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed May 1 10:44:24 2013 -0400
Tweak create-page to know about StrutsDelegate
diff --git a/java/scripts/java-create-page.pl b/java/scripts/java-create-page.pl
index 3e9d554..57dd1e4 100755
--- a/java/scripts/java-create-page.pl
+++ b/java/scripts/java-create-page.pl
@@ -73,7 +73,7 @@ append_struts();
sub generate_action {
my $import = "import com.redhat.rhn.frontend.struts.RhnAction;\n";
- $import = $import . "import com.redhat.rhn.frontend.struts.RhnHelper;\n\n";
+ $import = $import . "import com.redhat.rhn.frontend.struts.StrutsDelegate;\n\n";
$import = $import . "import org.apache.struts.action.ActionForm;\n";
$import = $import . "import org.apache.struts.action.ActionForward;\n";
$import = $import . "import org.apache.struts.action.ActionMapping;\n\n";
diff --git a/java/scripts/java-templates/actionbody.txt b/java/scripts/java-templates/actionbody.txt
index 0ce9196..1c51481 100644
--- a/java/scripts/java-templates/actionbody.txt
+++ b/java/scripts/java-templates/actionbody.txt
@@ -7,6 +7,6 @@
Map params = makeParamMap(request);
- return RhnHelper.forwardParams(mapping.findForward("default"), params);
+ return StrutsDelegate.getInstance().forwardParams(mapping.findForward("default"), params);
}
10 years, 12 months