client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 83377e42170f7eb13529651891461717207fab6c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 12:04:13 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.7-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 6824a71..c881ced 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: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Apr 28 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.7-1
+- The Debian client on x86_64 should send amd64-debian-linux
+ (slukasik(a)redhat.com)
+
* Sun Apr 17 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.6-1
- Codename might not be always present within lsb_release on Debian
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index b8c8968..eab29fd 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.6-1 client/rhel/rhn-client-tools/
+1.5.7-1 client/rhel/rhn-client-tools/
13 years
2 commits - client/debian client/rhel
by Šimon Lukašík
client/debian/apt-spacewalk/src/spacewalk | 9 ++++++---
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 473b5d6ab2220389d71bc9fb7910d1eb0cc72373
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 11:58:06 2011 +0200
The Debian client on x86_64 should send amd64-debian-linux
In the database we have only amd64 architecture not x86_64.
Addressing:
Error Message:
Architecture `x86_64-debian-linux' is not supported
Error Class Code: 24
Error Class Info: Unsupported server architecture.
Explanation:
An error has occurred while processing your request. If this problem
persists please enter a bug report at bugzilla.redhat.com.
If you choose to submit the bug report, please be sure to include
details of what you were trying to do when this error occurred and
details on how to reproduce this problem.
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 be79efd..c89a116 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -86,6 +86,8 @@ def getArch():
# On debian we only support i386
if arch in ['i486', 'i586', 'i686']:
arch = 'i386'
+ if arch == 'x86_64':
+ arch = 'amd64'
arch += '-debian-linux'
return arch
commit 5e8a0e7729828b81c86b049bd49d120a4279cc80
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 11:45:21 2011 +0200
The method can be killed by the keyboard interrupt
Apt-get can terminate the acquire method by force. For the
Python code it means that KeyboardInterrupt is throw.
Addressing:
Traceback (most recent call last):
File /usr/lib/apt/methods/spacewalk, line 263, in <module>
ret = method.run()
File /usr/lib/apt/methods/spacewalk, line 90, in run
msg = self.__get_next_msg()
File /usr/lib/apt/methods/spacewalk, line 47, in __get_next_msg
line = sys.stdin.readline()
KeyboardInterrupt
Reading package lists... Done
diff --git a/client/debian/apt-spacewalk/src/spacewalk b/client/debian/apt-spacewalk/src/spacewalk
index 3503995..02c0d97 100755
--- a/client/debian/apt-spacewalk/src/spacewalk
+++ b/client/debian/apt-spacewalk/src/spacewalk
@@ -259,6 +259,9 @@ class spacewalk_method(pkg_acquire_method):
if __name__ == '__main__':
- method = spacewalk_method()
- ret = method.run()
- sys.exit(ret)
+ try:
+ method = spacewalk_method()
+ ret = method.run()
+ sys.exit(ret)
+ except KeyboardInterrupt:
+ pass
13 years
Changes to 'refs/tags/spacewalk-proxy-installer-1.5.2-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-installer-1.5.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-04-28 09:17 +0000
Tagging package [spacewalk-proxy-installer] version [1.5.2-1] in directory [proxy/installer/].
Changes since spacewalk-java-1.5.10-1:
Marcelo Moreira de Mello (2):
699966 - added --ignore-missing option in rhncfg-manager to ignore missing local files when adding or uploading files
648868 - do not put proxy_broker.conf and proxy_redirect.conf to configuration channel
Miroslav Suchý (2):
remove macro from changelog
Automatic commit of package [spacewalk-proxy-installer] release [1.5.2-1].
---
client/tools/rhncfg/config_management/rhncfg_add.py | 10 +++++++++-
proxy/installer/configure-proxy.sh | 2 --
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
web/spacewalk-web.spec | 2 +-
5 files changed, 16 insertions(+), 6 deletions(-)
---
13 years
2 commits - proxy/installer rel-eng/packages
by Miroslav Suchý
proxy/installer/configure-proxy.sh | 2 --
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6e39710634780dbd5ea01d9744e3d65d695506a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 28 11:17:30 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.5.2-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 6b25fc5..ec19e94 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.5.1
+Version: 1.5.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Thu Apr 28 2011 Miroslav Suchý 1.5.2-1
+- 648868 - do not put proxy_broker.conf and proxy_redirect.conf to
+ configuration channel (mmello(a)redhat.com)
+
* Mon Apr 18 2011 Miroslav Suchý 1.5.1-1
- 696918 - honor hostedWhitelist during Proxy installation
- Bumping package versions for 1.5
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index f0e11bc..6a107e3 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.5.1-1 proxy/installer/
+1.5.2-1 proxy/installer/
commit be411a6ed081207f8fa4009dc949f9158455816e
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Apr 27 09:55:53 2011 -0300
648868 - do not put proxy_broker.conf and proxy_redirect.conf to configuration channel
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index b78ac52..75d857c 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -489,8 +489,6 @@ if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then
$SQUID_DIR/squid.conf \
$HTTPDCONFD_DIR/cobbler-proxy.conf \
$HTTPDCONF_DIR/httpd.conf \
- $HTTPDCONFD_DIR/proxy_broker.conf \
- $HTTPDCONFD_DIR/proxy_redirect.conf \
$JABBERD_DIR/c2s.xml \
$JABBERD_DIR/sm.xml
fi
13 years
2 commits - client/tools web/spacewalk-web.spec
by Miroslav Suchý
client/tools/rhncfg/config_management/rhncfg_add.py | 10 +++++++++-
web/spacewalk-web.spec | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 812793c6c24678e6e362d628ddef225c298f7ead
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Apr 27 09:32:24 2011 -0300
699966 - added --ignore-missing option in rhncfg-manager to ignore missing local files when adding or uploading files
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py b/client/tools/rhncfg/config_management/rhncfg_add.py
index 0795691..b88fbc1 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -44,6 +44,10 @@ class Handler(handler_base.HandlerBase):
'--delim-end', action="store",
help="End delimiter for variable interpolation",
),
+ handler_base.HandlerBase._option_class(
+ '-i', '--ignore-missing', action="store_true",
+ help="Ignore missing local files",
+ ),
]
def run(self):
@@ -96,7 +100,11 @@ class Handler(handler_base.HandlerBase):
for (local_file, remote_file) in files_to_push:
if not os.path.exists(local_file):
- die(9, "No such file `%s'" % local_file)
+ if self.options.ignore_missing:
+ files_to_push.remove((local_file,remote_file))
+ print "Local file %s does not exist. Ignoring file..." %(local_file)
+ else:
+ die(9, "No such file `%s'" % local_file)
print "Pushing to channel %s:" % (channel, )
commit 17d96d4a9a24bbe710ba2842aa2a8b1f4e6d7c1f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Apr 27 12:19:38 2011 +0200
remove macro from changelog
addressing:
spacewalk-web.src:299: W: macro-in-%changelog %files
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index aef163a..361bcf4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -296,7 +296,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 22 2011 Jan Pazdziora 1.4.13-1
- Moving the Requires: httpd from sniglets to base-minimal, dobby, and pxt
- which actually have %files with apache group in them.
+ which actually have %%files with apache group in them.
- No need to require mod_perl explicitly in spacewalk-sniglets, we will get it
via perl(Apache2::Cookie) and perl-libapreq2 from spacewalk-pxt.
- Removing RHEL 4 specific Requires as we no longer support Spacewalk on RHEL 4.
13 years
Changes to 'refs/tags/spacewalk-java-1.5.10-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-04-28 08:23 +0000
Tagging package [spacewalk-java] version [1.5.10-1] in directory [java/].
Changes since perl-Satcon-1.17-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.10-1].
---
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 881e4fc6fed5f72144fc0b270fb7b599ac8ee8d8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 28 10:23:53 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.10-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 33e111d..531b18d 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.5.9
+Version: 1.5.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 28 2011 Jan Pazdziora 1.5.10-1
+- 680176 - display unlimited subscriptions if applicable (mzazrivec(a)redhat.com)
+- 699753 - use the primary IP address from the rhnServerNetwork table
+ (tlestach(a)redhat.com)
+
* Mon Apr 25 2011 Jan Pazdziora 1.5.9-1
- 679009 - fixing the regular expression.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8030d03..277e98b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.9-1 java/
+1.5.10-1 java/
13 years
Changes to 'refs/tags/perl-Satcon-1.17-1'
by Jan Pazdziora
Tag 'perl-Satcon-1.17-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-04-28 08:23 +0000
Tagging package [perl-Satcon] version [1.17-1] in directory [projects/perl-Satcon/].
Changes since NPalert-1.126.22-1:
Jan Pazdziora (1):
Automatic commit of package [perl-Satcon] release [1.17-1].
---
projects/perl-Satcon/perl-Satcon.spec | 8 +++++++-
rel-eng/packages/perl-Satcon | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years
projects/perl-Satcon rel-eng/packages
by Jan Pazdziora
projects/perl-Satcon/perl-Satcon.spec | 8 +++++++-
rel-eng/packages/perl-Satcon | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit bbbfa66b475facf25e3bc80561440552c57683ab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 28 10:23:17 2011 +0200
Automatic commit of package [perl-Satcon] release [1.17-1].
diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec
index 66d29a7..b9f007b 100644
--- a/projects/perl-Satcon/perl-Satcon.spec
+++ b/projects/perl-Satcon/perl-Satcon.spec
@@ -1,6 +1,6 @@
Name: perl-Satcon
Summary: Framework for configuration files
-Version: 1.16
+Version: 1.17
Release: 1%{?dist}
License: GPLv2
Group: Applications/System
@@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Thu Apr 28 2011 Jan Pazdziora 1.17-1
+- Do not confuse me by saying Unsubstituted Tags when there are none.
+- Do not deploy .orig files.
+- When creating config files in /etc/rhn, clear access for other (make it
+ -rw-r-----, in typical case).
+
* Mon Apr 25 2011 Jan Pazdziora 1.16-1
- The File::Copy and File::Temp do not seem to be used in Satcon, removing the
use.
diff --git a/rel-eng/packages/perl-Satcon b/rel-eng/packages/perl-Satcon
index 16d12d2..8fab2f6 100644
--- a/rel-eng/packages/perl-Satcon
+++ b/rel-eng/packages/perl-Satcon
@@ -1 +1 @@
-1.16-1 projects/perl-Satcon/
+1.17-1 projects/perl-Satcon/
13 years
Changes to 'refs/tags/NPalert-1.126.22-1'
by Jan Pazdziora
Tag 'NPalert-1.126.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-04-27 13:11 +0000
Tagging package [NPalert] version [1.126.22-1] in directory [monitoring/NPalert/].
Changes since spacewalk-setup-1.5.3-1:
Jan Pazdziora (1):
Automatic commit of package [NPalert] release [1.126.22-1].
Milan Zazrivec (1):
680176 - display unlimited subscriptions if applicable
Tomas Lestach (1):
699753 - use the primary IP address from the rhnServerNetwork table
---
java/code/src/com/redhat/rhn/domain/server/Server.java | 12 ++++------
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 5 ++++
monitoring/NPalert/NPalert.spec | 6 ++++-
rel-eng/packages/NPalert | 2 -
4 files changed, 16 insertions(+), 9 deletions(-)
---
13 years