client/rhel
by Miroslav Suchý
client/rhel/yum-rhn-plugin/rhnplugin.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 16d247b4ca80fd07eb6d5139adcef44ef90d8542
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 26 11:17:20 2009 +0100
514467 - when we say RHN is disabled, we may actually really disable it
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index e7af545..b38271a 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -133,6 +133,7 @@ def init_hook(conduit):
except up2dateErrors.NoSystemIdError:
conduit.error(0, _("This system may not be a registered to RHN. SystemId could not be acquired.\n") +
RHN_DISABLED)
+ rhn_enabled = False
return
except up2dateErrors.RhnServerException, e:
conduit.error(0, COMMUNICATION_ERROR + "\n" + CHANNELS_DISABLED +
14 years, 4 months
Changes to 'refs/tags/jabberd-selinux-1.4.7-1'
by Miroslav Suchý
Tag 'jabberd-selinux-1.4.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-11-26 09:18 +0000
Tagging package [jabberd-selinux] version [1.4.7-1] in directory [selinux/jabberd-selinux/].
Changes since spacewalk-backend-0.7.17-1:
Miroslav Suchý (2):
use %global instead of %define
Automatic commit of package [jabberd-selinux] release [1.4.7-1].
---
rel-eng/packages/jabberd-selinux | 2 +-
selinux/jabberd-selinux/jabberd-selinux.spec | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
---
14 years, 4 months
2 commits - rel-eng/packages selinux/jabberd-selinux
by Miroslav Suchý
rel-eng/packages/jabberd-selinux | 2 +-
selinux/jabberd-selinux/jabberd-selinux.spec | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 1762792b05696897cf71a95f7bb3f5a47c0a0995
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 26 10:18:46 2009 +0100
Automatic commit of package [jabberd-selinux] release [1.4.7-1].
diff --git a/rel-eng/packages/jabberd-selinux b/rel-eng/packages/jabberd-selinux
index 779ef0c..f597614 100644
--- a/rel-eng/packages/jabberd-selinux
+++ b/rel-eng/packages/jabberd-selinux
@@ -1 +1 @@
-1.4.6-1 selinux/jabberd-selinux/
+1.4.7-1 selinux/jabberd-selinux/
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 12e0189..ccd5115 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -6,7 +6,7 @@
%global modulename jabber
Name: jabberd-selinux
-Version: 1.4.6
+Version: 1.4.7
Release: 1%{?dist}
Summary: SELinux policy module supporting jabberd
@@ -107,6 +107,9 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Thu Nov 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 1.4.7-1
+- use %%global instead of %%define
+
* Thu Jun 18 2009 Jan Pazdziora 1.4.6-1
- 505606 - Require at least selinux-policy 2.4.6-114
commit 9f5c9474a3bfd32ec680a2b367f6d48d5861fb36
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 26 10:16:26 2009 +0100
use %global instead of %define
https://fedoraproject.org/wiki/Packaging:Guidelines#.25global_preferred_o...
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 0e83b58..12e0189 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -1,10 +1,9 @@
+%global selinux_variants mls strict targeted
+%global selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
+%global POLICYCOREUTILSVER 1.33.12-1
-%define selinux_variants mls strict targeted
-%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
-%define POLICYCOREUTILSVER 1.33.12-1
-
-%define moduletype apps
-%define modulename jabber
+%global moduletype apps
+%global modulename jabber
Name: jabberd-selinux
Version: 1.4.6
14 years, 4 months
Changes to 'refs/tags/spacewalk-backend-0.7.17-1'
by Miroslav Suchý
Tag 'spacewalk-backend-0.7.17-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-11-26 08:52 +0000
Tagging package [spacewalk-backend] version [0.7.17-1] in directory [backend/].
Changes since yum-rhn-plugin-0.7.7-1:
Milan Zazrivec (1):
541262 - fix networkRetries logic
Miroslav Suchý (3):
add script which tell you when package has been tagged
fix compilation error
Automatic commit of package [spacewalk-backend] release [0.7.17-1].
Tomas Lestach (2):
updating ant-contrib path
adding checkstyle build dependency
---
backend/server/rhnChannel.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 5 ++++-
java/build.xml | 2 +-
java/buildconf/build-props.xml | 2 +-
rel-eng/last-package-tag | 9 +++++++++
rel-eng/packages/spacewalk-backend | 2 +-
7 files changed, 22 insertions(+), 6 deletions(-)
---
14 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 826da5b7404a1933aee1cd7822771c78d63f1d3b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 26 09:52:53 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e52cc00..5a26583 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.16
+Version: 0.7.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Nov 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.17-1
+- fix compilation error
+
* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.16-1
- 540544 - raise error if channel do not exist or you are not allowed to add or remove it
- 540544 - fix usage of check_user_password
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 03e0bce..5ae6e79 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.16-1 backend/
+0.7.17-1 backend/
14 years, 4 months
backend/server
by Miroslav Suchý
backend/server/rhnChannel.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5414241469e87993d0d74c78a11d642c839c19ee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 26 09:49:10 2009 +0100
fix compilation error
addressing:
rhnChannel.py: Error compiling
File "rhnChannel.py", line 2193
log_error("Asked to unsubscribe server %s "\ "from non-existent channel %s" % ( server_id, channel))
^
SyntaxError: unexpected character after line continuation character
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 96db6a6..335afee 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -2190,7 +2190,8 @@ def unsubscribe_channel(server_id, channel, username, password):
h.execute(channel = channel)
ret = h.fetchone_dict()
if not ret:
- log_error("Asked to unsubscribe server %s "\ "from non-existent channel %s" % ( server_id, channel))
+ log_error("Asked to unsubscribe server %s from non-existent channel %s" % (
+ server_id, channel))
raise rhnFault(40, "The specified channel '%s' does not exist." % channel)
if not ret["parent_channel"]:
log_error("Cannot unsubscribe %s from base channel %s" % (
14 years, 4 months
java/build.xml
by Tomas Lestach
java/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 72f658bf991f2b538dd663a1039a814ece512801
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 25 18:13:20 2009 +0100
adding checkstyle build dependency
to be able to run "ant clean && ant checkstyle"
diff --git a/java/build.xml b/java/build.xml
index 2e18d66..42ce7b9 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -324,7 +324,7 @@
<!-- We may want to break this down so that we can specify directories or
classes to operate on. But, hopefully our checkstyle report will
generally be clean, so we may be able to always check all classes. -->
- <target name="checkstyle" depends="init">
+ <target name="checkstyle" depends="init,do-compile-main">
<mkdir dir="${report.dir}" />
<checkstyle config="buildconf/checkstyle.xml" failOnViolation="true" >
<property key="javadoc.method.scope" value="public" />
14 years, 4 months
java/buildconf
by Tomas Lestach
java/buildconf/build-props.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 18a5c54004991d12c360f317b97593e34bf0b2c1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 24 14:57:32 2009 +0100
updating ant-contrib path
addressing /usr/bin/build-jar-repository: error: Could not find ant-contrib Java extension for this JVM
when building spacewalk-java
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 8d6576c..c4971aa 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -82,7 +82,7 @@
regexp tyrex jmock jmock-cglib strutstest gsbase" / -->
<property name="install.build.jar.dependencies"
- value="ant ant/ant-junit ant-contrib antlr
+ value="ant ant/ant-junit ant/ant-contrib antlr
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
14 years, 4 months
rel-eng/last-package-tag
by Miroslav Suchý
rel-eng/last-package-tag | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit cd51d99bd934bf858478ab85e256073deb7c97e6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 25 15:04:37 2009 +0100
add script which tell you when package has been tagged
diff --git a/rel-eng/last-package-tag b/rel-eng/last-package-tag
new file mode 100755
index 0000000..3c3abdc
--- /dev/null
+++ b/rel-eng/last-package-tag
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# list date when package was last tagged
+# since nightly build pick up every tag and build it,
+# we can assume it is date of package build
+
+for p in `cat rel-eng/packages/* |cut -f2 -d' '`; do
+ echo `git log '--pretty=format:%ci' $p |head -n1` $p
+done |sort
14 years, 4 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit dd9ffb1e6bc62bb1c8bb80da110ebeeedb722986
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 25 14:35:44 2009 +0100
541262 - fix networkRetries logic
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
index b54be87..1a810d9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -191,7 +191,10 @@ def doCall(method, *args, **kwargs):
ret = None
attempt_count = 1
- attempts = cfg["networkRetries"] or 5
+ if cfg["networkRetries"]:
+ attempts = cfg["networkRetries"] or 5
+ else:
+ attempts = 0
while 1:
failure = 0
14 years, 4 months