Changes to 'refs/tags/spacewalk-java-1.8.107-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.107-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-12 15:08 +0000
Tagging package [spacewalk-java] version [1.8.107-1] in directory [java/].
Changes since spacewalk-backend-1.8.48-1:
Tomas Lestach (4):
748331 - fix appropriate tests
829790 - fix PxtCookieManagerTest test
829790 - fix PxtSessionDelegateImplTest test
Automatic commit of package [spacewalk-java] release [1.8.107-1].
---
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java | 6 ------
java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java | 1 +
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)
---
11 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit c7bedc1714f20c9fd7e862a5f954a82261601c8f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 12 17:08:14 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.107-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f7212a0..0529357 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.106
+Version: 1.8.107
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 12 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.107-1
+- 829790 - fix PxtSessionDelegateImplTest test
+- 829790 - fix PxtCookieManagerTest test
+- 748331 - fix appropriate tests
+- removing @Override annotations for methods that aren't overriden
+- Copying kopts to the xen distro.
+
* Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.106-1
- COALESCE instead of NVL keyword for pgsql compatibility
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2f6754c..a843e33 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.106-1 java/
+1.8.107-1 java/
11 years, 9 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java | 6 ------
java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java | 1 +
3 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 9e1b12850dde4eae52a228192b583442f3ae7955
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 12 17:06:33 2012 +0200
829790 - fix PxtSessionDelegateImplTest test
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java
index 16716e7..cd4b17c 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtSessionDelegateImplTest.java
@@ -151,6 +151,7 @@ public class PxtSessionDelegateImplTest extends MockObjectTestCase {
mockRequest.stubs().method("getServerName").will(
returnValue("somehost.redhat.com"));
+ mockRequest.stubs().method("getHeader").withAnyArguments().will(returnValue(null));
}
private void setUpLoadPxtSession() {
commit 95d1232d23eb55db1065cc9d401e3292b4462ebf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 12 17:03:06 2012 +0200
829790 - fix PxtCookieManagerTest test
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java
index 995d9fa..1854b6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java
@@ -75,6 +75,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase {
domain = "redhat.com";
mockRequest.stubs().method("getServerName").will(returnValue(host + "." + domain));
+ mockRequest.stubs().method("getHeader").withAnyArguments().will(returnValue(null));
}
protected void tearDown() throws Exception {
commit 13a8b963991d7e6503798d7c4edb988bf4abfd08
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 12 16:26:13 2012 +0200
748331 - fix appropriate tests
do not check the session if we do not create the extra one
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java
index 422aff0..4678dd6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java
@@ -69,8 +69,6 @@ public class KickstartHelperTest extends BaseTestCaseWithUser {
assertNotNull(options.get("label"));
assertNotNull(options.get("ksdata"));
assertNotNull(options.get("host"));
- assertNotNull(options.get("session"));
-
}
public void testKsViewLabel() {
@@ -104,10 +102,6 @@ public class KickstartHelperTest extends BaseTestCaseWithUser {
Map options = helper.parseKickstartUrl(url);
assertEquals(ksdata, options.get("ksdata"));
- // This is the key test
-
-
- assertNotNull(options.get("session"));
}
public void testValidateKickstartChannel() throws Exception {
11 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.8.48-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.48-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-12 13:51 +0000
Tagging package [spacewalk-backend] version [1.8.48-1] in directory [backend/].
Changes since spacewalk-web-1.8.27-1:
Michael Mraka (3):
fixed ERROR: subquery in FROM must have an alias
prostgresql don't know about decode
Automatic commit of package [spacewalk-backend] release [1.8.48-1].
Tomas Lestach (1):
removing @Override annotations for methods that aren't overriden
---
backend/satellite_tools/updatePackages.py | 11 ++++++----
backend/spacewalk-backend.spec | 6 ++++-
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java | 2 -
java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 1
rel-eng/packages/spacewalk-backend | 2 -
5 files changed, 13 insertions(+), 9 deletions(-)
---
11 years, 9 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1b35276aa5dbddb6470cd51c6d4559f5e92713f8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 15:51:57 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.48-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0d3983b..76e3764 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.47
+Version: 1.8.48
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jul 12 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.48-1
+- prostgresql don't know about decode
+- fixed ERROR: subquery in FROM must have an alias
+
* Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.47-1
- Fix indentation error
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d928e20..8696c67 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.47-1 backend/
+1.8.48-1 backend/
11 years, 9 months
2 commits - backend/satellite_tools
by Michael Mraka
backend/satellite_tools/updatePackages.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 519838a74efa4f13b34f5e420ad390886678d1d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 15:38:52 2012 +0200
prostgresql don't know about decode
fixing
ERROR: function decode(unknown, unknown, text, unknown) does not exist
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index ea0b28e..0c0ebee 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -101,10 +101,13 @@ _get_path_query = """
rhnChecksumView.checksum,
rhnPackage.path,
rhnPackageEvr.epoch,
- decode(rhnPackage.org_id, null, 'NULL', rhnPackage.org_id) || '/' || substr(rhnChecksumView.checksum, 1, 3)
+ case when rhnPackage.org_id is null then 'NULL'
+ else rhnPackage.org_id || '' end
+ || '/' || substr(rhnChecksumView.checksum, 1, 3)
|| '/' || rhnPackageName.name
- || '/' || decode(rhnPackageEvr.epoch, null, '', rhnPackageEvr.epoch || ':')
- || rhnPackageEvr.version || '-' || rhnPackageEvr.release
+ || '/' || case when rhnPackageEvr.epoch is null then ''
+ else rhnPackageEvr.epoch || ':' end
+ || rhnPackageEvr.version || '-' || rhnPackageEvr.release
|| '/' || rhnPackageArch.label
|| '/' || rhnChecksumView.checksum
|| substr(rhnPackage.path, instr(rhnPackage.path, '/', -1))
commit 63cad5aee9da45d54762d9619fdfbff2f197b727
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 15:35:32 2012 +0200
fixed ERROR: subquery in FROM must have an alias
fixing
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('subquery
in FROM must have an alias at character 67\nHINT: For example, FROM
(SELECT ...) [AS] foo.\n', 0, "\n\tselect id, checksum_type, checksum,
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index 5c87244..ea0b28e 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -114,7 +114,7 @@ _get_path_query = """
and rhnPackage.evr_id = rhnPackageEvr.id
and rhnPackage.package_arch_id = rhnPackageArch.id
and rhnPackage.checksum_id = rhnChecksumView.id
- )
+ ) X
where '/' || new_path <> nvl(substr(path, -length(new_path) - 1), 'x')
"""
11 years, 9 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java | 2 --
java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 1 -
2 files changed, 3 deletions(-)
New commits:
commit 962b491d05abf52f0f73171c059baf743beb98a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 12 15:34:39 2012 +0200
removing @Override annotations for methods that aren't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
index 7b8f173..79f0981 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
@@ -61,7 +61,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
/**
* {@inheritDoc}
*/
- @Override
public String toText() {
// really a noop
return "";
@@ -71,7 +70,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
*
* {@inheritDoc}
*/
- @Override
public Transaction getTransaction() {
return txn;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
index 0603cfa..ab881d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
@@ -41,7 +41,6 @@ public class TraceBackEvent extends BaseEvent implements EventMessage {
* request values
* @return Text of email.
*/
- @Override
public String toText() {
StringWriter sw = new StringWriter();
PrintWriter out = new PrintWriter(sw);
11 years, 9 months
Changes to 'refs/tags/spacewalk-web-1.8.27-1'
by Michael Mraka
Tag 'spacewalk-web-1.8.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-12 08:48 +0000
Tagging package [spacewalk-web] version [1.8.27-1] in directory [web/].
Changes since yum-rhn-plugin-1.8.3-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [1.8.27-1].
Pierre Casenove (1):
Fix ISE on pgsql: Error message: RHN::Exception: DBD::Pg::st execute failed: ERROR: syntax error at or near "NAME" at character 40
Uwe Gansert (1):
Copying kopts to the xen distro.
---
java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java | 7 +++++++
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/Server.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
4 files changed, 13 insertions(+), 3 deletions(-)
---
11 years, 9 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d998f08abe5d23aa50a19c9f514975d388ac8d5f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 10:48:59 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.27-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index da6a923..edd944b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.26-1 web/
+1.8.27-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e2cb974..4a11a4a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.26
+Version: 1.8.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jul 12 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.27-1
+- Fix ISE on pgsql: Error message: RHN::Exception: DBD::Pg::st execute failed
+
* Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.26-1
- cross-database references are not implemented: pe.evr.as_vre_simple
11 years, 9 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/Server.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a4d1219d7294fe142c74182f29d67c323f3753ab
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Wed Jul 11 16:20:49 2012 +0000
Fix ISE on pgsql: Error message: RHN::Exception: DBD::Pg::st execute failed: ERROR: syntax error at or near "NAME" at character 40
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 8d466ad..235c483 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -848,7 +848,7 @@ sub server_event_delta_action {
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
-SELECT rTO.label AS OPERATION, PN.name NAME, PN.name || '-' || PE.evr.as_vre_simple() AS NVRE
+SELECT rTO.label AS OPERATION, PN.name AS NAME, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnTransactionOperation rTO,
11 years, 9 months