java/buildconf java/build.xml
by Tomas Lestach
java/build.xml | 1 -
java/buildconf/build-props.xml | 1 -
2 files changed, 2 deletions(-)
New commits:
commit 3c55d16faa63d33542266924ce32a94448d495f8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 18 14:15:45 2011 +0200
removing eclipse.libsrc.dirs since the directory was removed
on Tue Sep 7 2010
diff --git a/java/build.xml b/java/build.xml
index 008223c..e421178 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -65,7 +65,6 @@
<exec executable="${basedir}/scripts/gen-eclipse.py"
output="${basedir}/.classpath" >
<arg value="${eclipse.lib.dirs}:${rhn-home}/buildconf/tempjars:${env.JAVA_HOME}/lib/tools.jar" />
- <arg value="${eclipse.libsrc.dirs}" />
</exec>
</target>
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index b29625d..03cfc8e 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -19,7 +19,6 @@
<property name="build.instrument.dir" location="${build.dir}/instrumented" />
<property name="eclipse.lib.dirs" location="${lib.dir}" />
- <property name="eclipse.libsrc.dirs" location="${basedir}/code/libsrc" />
<property name="log4j.threshold" value="warn" />
<property name="rhn.checkout.dir" value="" />
12 years, 8 months
Changes to 'refs/tags/spacewalk-backend-1.6.10-1'
by Tomas Lestach
Tag 'spacewalk-backend-1.6.10-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-18 09:45 +0000
Tagging package [spacewalk-backend] version [1.6.10-1] in directory [backend/].
Changes since spacewalk-java-1.6.23-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-backend] release [1.6.10-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 8 months
backend/spacewalk-backend.spec rel-eng/packages
by Tomas Lestach
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 24ffa6bf5d7d82093019da2db314e1d545b9c103
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 18 11:45:25 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.10-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index af617b0..ac4d3d6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.9
+Version: 1.6.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -672,6 +672,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Aug 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.10-1
+- 658533 - remove default currency from backend part of rhn.conf
+ (tlestach(a)redhat.com)
+
* Tue Aug 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.9-1
- 730452 - fixed table aliasses
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a6e8ac4..75cd5c0 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.9-1 backend/
+1.6.10-1 backend/
12 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.6.23-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.23-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-18 09:45 +0000
Tagging package [spacewalk-java] version [1.6.23-1] in directory [java/].
Changes since rhncfg-5.10.14-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.6.23-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4b7c2b03788d50c30bebe4d3cd34f40f3b6246ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 18 11:45:02 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.23-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d385d61..0fecffd 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.6.22
+Version: 1.6.23
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.23-1
+- 658533 - remove default currency from backend part of rhn.conf
+ (tlestach(a)redhat.com)
+
* Tue Aug 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.22-1
- 654996 - sort activation key packages by name (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d187c24..2a3de77 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.22-1 java/
+1.6.23-1 java/
12 years, 8 months
Changes to 'refs/tags/rhncfg-5.10.14-1'
by Michael Mraka
Tag 'rhncfg-5.10.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-08-18 09:06 +0000
Tagging package [rhncfg] version [5.10.14-1] in directory [client/tools/rhncfg/].
Changes since rhnlib-2.5.45-1:
Michael Mraka (2):
731284 - is_selinux_enabled is not defined on RHEL4
Automatic commit of package [rhncfg] release [5.10.14-1].
Tomas Lestach (1):
658533 - remove default currency from backend part of rhn.conf
---
backend/rhn-conf/rhn.conf | 6 -----
client/tools/rhncfg/config_common/file_utils.py | 2 +
client/tools/rhncfg/rhncfg.spec | 5 +++-
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 12 +++++------
rel-eng/packages/rhncfg | 2 -
5 files changed, 13 insertions(+), 14 deletions(-)
---
12 years, 8 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit df80c051727ea4a8164d2359c352fbba2ff1e216
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 18 11:06:50 2011 +0200
Automatic commit of package [rhncfg] release [5.10.14-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 5c1a213..da29649 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.13
+Version: 5.10.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.10.14-1
+- 731284 - is_selinux_enabled is not defined on RHEL4
+
* Fri Aug 12 2011 Miroslav Suchý 5.10.13-1
- add proto, server_name and server_list to local_config overrides
- None has not iteritems() method
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index b44dcb7..a955a63 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.13-1 client/tools/rhncfg/
+5.10.14-1 client/tools/rhncfg/
12 years, 8 months
client/tools
by Michael Mraka
client/tools/rhncfg/config_common/file_utils.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6704e6716beec1dd4c87795c6dcb454d242839d0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 18 10:51:34 2011 +0200
731284 - is_selinux_enabled is not defined on RHEL4
fixing
Traceback (most recent call last):
File "/usr/sbin/rhn_check", line 345, in ?
handle_action(action)
File "/usr/sbin/rhn_check", line 218, in handle_action
(status, message, data) = run_action(method, params)
File "/usr/sbin/rhn_check", line 174, in run_action
(status, message, data) = do_call(method, params)
File "/usr/sbin/rhn_check", line 91, in do_call
retval = apply(method, params)
File "/usr/share/rhn/actions/configfiles.py", line 330, in diff
diff = fp.diff(file)
File "/usr/share/rhn/config_common/file_utils.py", line 105, in diff
if not is_selinux_enabled():
NameError: global name 'is_selinux_enabled' is not defined
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 007fdbe..70563e6 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -24,6 +24,8 @@ except:
# on rhel4 we do not support selinux
def lgetfilecon(path):
return [0, '']
+ def is_selinux_enabled():
+ return 0
from config_common import utils
12 years, 8 months
backend/rhn-conf java/code
by Tomas Lestach
backend/rhn-conf/rhn.conf | 6 -----
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 12 +++++------
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit c6e25a418fbf0f29f17f3db4797ab766c90cc951
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 17 16:15:37 2011 +0200
658533 - remove default currency from backend part of rhn.conf
and take over the defaults to the code
diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf
index 5e563de..a257157 100644
--- a/backend/rhn-conf/rhn.conf
+++ b/backend/rhn-conf/rhn.conf
@@ -13,9 +13,3 @@ log_file = /var/log/rhn/rhn.log
enable_snapshots = 1
-sc.crit = 32
-sc.imp = 16
-sc.mod = 8
-sc.low = 4
-sc.bug = 2
-sc.enh = 1
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 6b0fa12..3e5401d 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -186,7 +186,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for critical security errata
*/
public Integer getSCCrit() {
- return Config.get().getInt(SYSTEM_CURRENCY_CRIT);
+ return Config.get().getInt(SYSTEM_CURRENCY_CRIT, 32);
}
/**
@@ -194,7 +194,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for important security errata
*/
public Integer getSCImp() {
- return Config.get().getInt(SYSTEM_CURRENCY_IMP);
+ return Config.get().getInt(SYSTEM_CURRENCY_IMP, 16);
}
/**
@@ -202,7 +202,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for moderate security errata
*/
public Integer getSCMod() {
- return Config.get().getInt(SYSTEM_CURRENCY_MOD);
+ return Config.get().getInt(SYSTEM_CURRENCY_MOD, 8);
}
/**
@@ -210,7 +210,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for low security errata
*/
public Integer getSCLow() {
- return Config.get().getInt(SYSTEM_CURRENCY_LOW);
+ return Config.get().getInt(SYSTEM_CURRENCY_LOW, 4);
}
/**
@@ -218,7 +218,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for bug fix errata
*/
public Integer getSCBug() {
- return Config.get().getInt(SYSTEM_CURRENCY_BUG);
+ return Config.get().getInt(SYSTEM_CURRENCY_BUG, 2);
}
/**
@@ -226,7 +226,7 @@ public class ConfigDefaults {
* @return the System Currency multiplier for enhancement errata
*/
public Integer getSCEnh() {
- return Config.get().getInt(SYSTEM_CURRENCY_ENH);
+ return Config.get().getInt(SYSTEM_CURRENCY_ENH, 1);
}
/**
12 years, 8 months
Changes to 'refs/tags/rhnlib-2.5.45-1'
by Martin Minar
Tag 'rhnlib-2.5.45-1' created by Martin Minar <mminar(a)redhat.com> at 2011-08-17 12:44 +0000
Tagging package [rhnlib] version [2.5.45-1] in directory [client/rhel/rhnlib/].
Changes since rhn-client-tools-1.6.14-1:
Martin Minar (1):
Automatic commit of package [rhnlib] release [2.5.45-1].
---
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 8 months