java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 1
java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 6
++---
java/spacewalk-java.spec | 8
++++++-
rel-eng/packages/spacewalk-java | 2
-
rel-eng/packages/spacewalk-web | 2
-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 7
+++---
web/spacewalk-web.spec | 11
+++++++++-
7 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 2f656a1fd14f3567aabac4e0d0b954005efd7272
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 2 18:34:25 2011 +0100
Automatic commit of package [spacewalk-web] release [1.4.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 534858e..377142a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.4.7-1 web/
+1.4.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 8a36b46..6e6c1fd 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.7
+Version: 1.4.8
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -260,6 +260,15 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Mar 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.8-1
+- consider also package arch when searching systems accorging to a package
+ (tlestach(a)redhat.com)
+- Removal of rhn-load-config.pl made
+ RHN::DB::SatInstall::get_nls_database_parameters unused, removing.
+ (jpazdziora(a)redhat.com)
+- Removal of rhn-load-config.pl made RHN::SatInstall::generate_secret unused,
+ removing. (jpazdziora(a)redhat.com)
+
* Mon Feb 28 2011 Jan Pazdziora 1.4.7-1
- Replacing date arithmetics with current_timestamp + numtodsinterval().
- We need to use current_timestamp instead of sysdate.
commit 9545335fa06aeafe501fb4536ba612a86c3e612e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 2 18:34:16 2011 +0100
Automatic commit of package [spacewalk-java] release [1.4.14-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3d3523a..906c2af 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.13
+Version: 1.4.14
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -537,6 +537,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.14-1
+- 639134 - consider also package arch when searching systems according to a
+ package (tlestach(a)redhat.com)
+- 640958 - fixing NullPointerException (tlestach(a)redhat.com)
+- do not show delete link on creation of notes (bnc#672090) (jrenner(a)suse.de)
+
* Mon Feb 28 2011 Jan Pazdziora 1.4.13-1
- No need to convert numeric values to upper.
- Fixing affected_by_errata for PostgreSQL.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 56eeaa5..79caee2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.13-1 java/
+1.4.14-1 java/
commit 557f4c9b0131e31707a9b51227302d00dc1e1692
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 2 16:36:32 2011 +0100
consider also package arch when searching systems accorging to a package
similar to BZ#639134 fix (previous commit)
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index f482eee..bc972c0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -359,9 +359,10 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
<query params="pid, user_id">
SELECT SP.server_id AS id
FROM rhnServerPackage SP
- WHERE
- SP.name_id = (SELECT P.name_id from rhnPackage P where P.id = :pid)
- AND SP.evr_id = (SELECT P.evr_id from rhnPackage P where P.id = :pid)
+ WHERE P.id = :pid
+ AND P.name_id = SP.name_id
+ AND P.evr_id = SP.evr_id
+ AND P.package_arch_id = SP.package_arch_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND
USP.server_id = SP.server_id)
</query>
<elaborator name="system_overview" />
commit 9a13e6c95577cb8f9f21e619bf87e32d59f45fbc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 2 16:02:13 2011 +0100
639134 - consider also package arch when searching systems according to a package
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index ffe9db3..ce73cce 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -370,6 +370,7 @@ SELECT S.id, S.name
AND P.id = :pid
AND P.name_id = SP.name_id
AND P.evr_id = SP.evr_id
+ AND P.package_arch_id = SP.package_arch_id
AND SP.server_id = S.id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND
USP.server_id = S.id)
ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
commit a9a7034d8d68453df218ee0a95c4629254fba566
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 24 20:17:02 2011 +0100
640958 - fixing NullPointerException
diff --git
a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
index 27f2a21..cffc4b0 100644
--- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
@@ -41,8 +41,8 @@ public class UpdateOrgSoftwareEntitlementsCommand {
Logger.getLogger(UpdateOrgSoftwareEntitlementsCommand.class);
private Org org;
- private long newTotal;
- private long newFlexTotal;
+ private Long newTotal;
+ private Long newFlexTotal;
private ChannelFamily channelFamily;
/**
@@ -137,7 +137,7 @@ public class UpdateOrgSoftwareEntitlementsCommand {
orgMax = 0L;
}
// No sense making the call if its the same.
- if (proposed.compareTo(orgMax) == 0) {
+ if (proposed == null || proposed.compareTo(orgMax) == 0) {
return null;
}