java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 45de4fb041e8ee07316a38fe2d3a805b6782ca09
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri Jun 26 09:38:16 2009 -0400
508220 - fixed channel sharing syntax error on english side
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 521532d..7527dd8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11555,7 +11555,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
</trans-unit>
<trans-unit id="channels.shared.jsp.header1">
- <source>The software channels listed below my be shared by your organization.</source>
+ <source>The software channels listed below may be shared by your organization.</source>
</trans-unit>
<trans-unit id="channels.custom.jsp.header1">
14 years, 10 months
java/code
by Devan Goodwin
java/code/src/com/redhat/rhn/domain/server/Server.java | 4 ++--
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e39a8035a199da3ed34d48c922aa9ca622afecd4
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Fri Jun 26 10:21:46 2009 -0300
Fix API call to remove server custom data value.
Looks like this was being hidden by our recently removed hibernate
exception hiding.
At least in this test, deleting a custom data value from a server was
getting re-saved as the object wasn't actually deleted from it's
association with the server. Seems likely this would be a problem for
actual API use as well.
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 115db94..4df50ef 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -92,7 +92,7 @@ public class Server extends BaseDomainHelper implements Identifiable {
private Ram ram;
private Dmi dmi;
private Set networkInterfaces;
- private Set customDataValues;
+ private Set<CustomDataValue> customDataValues;
private Set channels;
private List configChannels = Collections.EMPTY_LIST;
private Set localChannels = new HashSet();
@@ -994,7 +994,7 @@ public class Server extends BaseDomainHelper implements Identifiable {
/**
* @return Returns the customDataValues.
*/
- public Set getCustomDataValues() {
+ public Set<CustomDataValue> getCustomDataValues() {
return customDataValues;
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
index 2ac9d88..d265624 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
@@ -95,6 +95,7 @@ public class ServerFactory extends HibernateFactory {
*/
public static void removeCustomDataValue(Server server, CustomDataKey key) {
CustomDataValue value = server.getCustomDataValue(key);
+ server.getCustomDataValues().remove(value);
if (value != null) {
singleton.removeObject(value);
}
14 years, 10 months
Changes to 'refs/tags/rhn-client-tools-0.6.1-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.6.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-06-26 12:54 +0000
Tagging package [rhn-client-tools] version [0.6.1-1] in directory [client/rhel/rhn-client-tools/].
Changes since yum-rhn-plugin-0.5.7-1:
Miroslav Suchý (2):
code cleanup - there is no usage of md5 in this code
Automatic commit of package [rhn-client-tools] release [0.6.1-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 1 -
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
14 years, 10 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 1 -
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 7b3fefff63f8dc5fb07bb0155b975728cb5d1ae0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 14:54:04 2009 +0200
Automatic commit of package [rhn-client-tools] release [0.6.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 5dc8c60..bdab38e 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.4.28
+Version: 0.6.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -204,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Fri Jun 26 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.6.1-1
+- code cleanup - there is no usage of md5 in this code
+- bump up version to 0.6
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.4.28-1
- 503090 - Fix missing packages reported during rhnreg_ks.
(dgoodwin(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ef7f6d9..645d98f 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.4.28-1 client/rhel/rhn-client-tools/
+0.6.1-1 client/rhel/rhn-client-tools/
commit 6e0cf98d4d2a50e8e262dad6dd169aa26be01be4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 14:51:53 2009 +0200
code cleanup - there is no usage of md5 in this code
addressing:
/usr/share/rhn/up2date_client/up2dateUtils.py:14: DeprecationWarning: the md5 module is deprecated; use hashlib instead
import md5
An error has occurred:
<type exceptions.TypeError>
See /var/log/up2date for more information
Which happend on F11
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
index 4f1d75c..9ee6198 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -11,7 +11,6 @@ import os
import sys
import rpm
import string
-import md5
import up2dateErrors
import transaction
14 years, 10 months
Changes to 'refs/tags/yum-rhn-plugin-0.5.7-1'
by Miroslav Suchý
Tag 'yum-rhn-plugin-0.5.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-06-26 12:40 +0000
Tagging package [yum-rhn-plugin] version [0.5.7-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-proxy-0.6.6-1:
Miroslav Suchý (2):
yum-rhn-plugin requires m2crypto
Automatic commit of package [yum-rhn-plugin] release [0.5.7-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 10 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d4bce1069cd9aab44f6e1720ce4d8c4fa0b3a1f1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 14:40:35 2009 +0200
Automatic commit of package [yum-rhn-plugin] release [0.5.7-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 0157c6d..1a0b102 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
Source: %{name}-%{version}.tar.gz
-Version: 0.5.6
+Version: 0.5.7
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -60,6 +60,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP
%changelog
+* Fri Jun 26 2009 John Matthews <jmatthew(a)redhat.com> 0.5.7-1
+- yum-rhn-plugin requires m2crypto
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.5.6-1
- yum operations are not getting redirected as the GET requested is formed at
the plugin level and not through rhnlib. (pkilambi(a)redhat.com)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 1544f8d..ef578d7 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-0.5.6-1 client/rhel/yum-rhn-plugin/
+0.5.7-1 client/rhel/yum-rhn-plugin/
commit 44a483d18aee83e460206ffb3eb8f28e8bf3a5e9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 14:39:22 2009 +0200
yum-rhn-plugin requires m2crypto
addressing:
Traceback (most recent call last):
File "/usr/lib/yum-plugins/rhnplugin.py", line 43, in <module>
from M2Crypto.SSL import SSLError, Connection
ImportError: No module named M2Crypto.SSL
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index a4e6556..0157c6d 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -15,6 +15,7 @@ BuildRequires: gettext
Requires: yum >= 3.0-5.3
Requires: rhn-client-tools >= 0.4.19
+Requires: m2crypto
# Not really, but for upgrades we need these
Requires: rhn-setup
14 years, 10 months
Changes to 'refs/tags/spacewalk-proxy-0.6.6-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-0.6.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-06-26 09:15 +0000
Tagging package [spacewalk-proxy] version [0.6.6-1] in directory [proxy/proxy/].
Changes since spacewalk-java-0.6.29-1:
John Matthews (1):
ErrataSearch, add "synopsis" to ALL_FIELDS
Miroslav Suchý (2):
fix build error
Automatic commit of package [spacewalk-proxy] release [0.6.6-1].
---
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 2 +-
proxy/proxy/broker/rhnRepository.py | 3 +--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
---
14 years, 10 months
2 commits - proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/broker/rhnRepository.py | 3 +--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 8b411f10d7081c04954026fb4a656a4dd89bfadc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 11:15:43 2009 +0200
Automatic commit of package [spacewalk-proxy] release [0.6.6-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 65f9545..e83ca74 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.6.5
+Version: 0.6.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -288,6 +288,9 @@ fi
%changelog
+* Fri Jun 26 2009 John Matthews <jmatthew(a)redhat.com> 0.6.6-1
+- fix build error
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.5-1
- change comments to docstrings (msuchy(a)redhat.com)
- change comments to docstrings (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index c208048..16c29cd 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-0.6.5-1 proxy/proxy/
+0.6.6-1 proxy/proxy/
commit 0a334d1d82426ffd6279777cb03f4eaf67bbd119
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 26 11:15:01 2009 +0200
fix build error
addressing:
rhnRepository.py: Error compiling
File "rhnRepository.py", line 247
name = nvrea[0]
^
SyntaxError: unindent does not match any outer indentation level
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py
index 454518d..3daa794 100644
--- a/proxy/proxy/broker/rhnRepository.py
+++ b/proxy/proxy/broker/rhnRepository.py
@@ -242,8 +242,7 @@ def listPackages(function, channel, version):
def computePackagePath(nvrea, source=0, prepend=""):
- """ Finds the appropriate path, prepending something if necessary """
-
+ """ Finds the appropriate path, prepending something if necessary """
name = nvrea[0]
release = nvrea[2]
14 years, 10 months
java/code
by John Matthews
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3861a01016f590d581d47591c24fa50f8119cca5
Author: John Matthews <jmatthew(a)redhat.com>
Date: Thu Jun 25 18:22:34 2009 -0400
ErrataSearch, add "synopsis" to ALL_FIELDS
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index 2ea77af..5febc05 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -559,7 +559,7 @@ public class ErrataSearchAction extends RhnAction {
query = escapeSpecialChars(query);
return "(description:(" + query + ") topic:(" + query + ") solution:(" +
query + ") notes:(" + query + ") product:(" + query + ")" +
- " advisoryName:(" + query + "))";
+ " advisoryName:(" + query + ") synopsis:(" + query + "))";
}
else if (OPT_ADVISORY.equals(mode)) {
query = escapeSpecialChars(query);
14 years, 10 months
Changes to 'refs/tags/spacewalk-java-0.6.29-1'
by John Matthews
Tag 'spacewalk-java-0.6.29-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-06-25 21:54 +0000
Tagging package [spacewalk-java] version [0.6.29-1] in directory [java/].
Changes since rhn-virtualization-5.4.1-1:
John Matthews (1):
Automatic commit of package [spacewalk-java] release [0.6.29-1].
---
java/spacewalk-java.spec | 4 ++--
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
14 years, 10 months