client/tools
by Milan Zazrivec
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit f8924b4c4c71bfe851e3084b612f7e9934c9738f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 30 17:26:26 2011 +0100
fix TB during re-provisioning with static nic
This fix is to prevent exception in case no address/netmask was found:
<type 'exceptions.IndexError'>
list index out of range
File "/usr/share/rhn/spacewalkkoan/spacewalkkoan.py", line 100, in initiate
update_static_device_records(kickstart_host, static_device)
File "/usr/share/rhn/spacewalkkoan/spacewalkkoan.py", line 78, in update_static_device_records
"ip": find_ip(static_device),\
File "/usr/share/rhn/spacewalkkoan/spacewalkkoan.py", line 52, in find_ip
return execute("LANG=C ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)[0]
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index 281e594..1420580 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -46,7 +46,11 @@ def find_host_name():
return execute("hostname")[0]
def find_netmask(device):
- return execute("LANG=C ifconfig %s | perl -lne '/Mask:([\d.]+)/ and print $1'" % device)[0]
+ nm = execute("LANG=C ifconfig %s | perl -lne '/Mask:([\d.]+)/ and print $1'" % device)
+ if nm:
+ return nm[0]
+ else:
+ return ""
def find_netmask6(device):
nm6 = execute("LANG=C ifconfig %s | perl -lne '/inet6 addr: [[:xdigit:]:]+\/([\d]+).+Scope:Global/ and print $1'" % device)
@@ -56,7 +60,11 @@ def find_netmask6(device):
return ""
def find_ip(device):
- return execute("LANG=C ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)[0]
+ ip = execute("LANG=C ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)
+ if ip:
+ return ip[0]
+ else:
+ return ""
def find_ip6(device):
ip6 = execute("LANG=C ifconfig %s | perl -lne '/inet6 addr: ([[:xdigit:]:]+).+Scope:Global/ and print $1'" % device)
12 years, 3 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7c2b37ad9dd2a972e04bb31cbb021047c6572564
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 30 17:21:34 2011 +0100
743259 - take hostname of client instead of server
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index f2e68d8..d85d5d0 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -428,11 +428,12 @@ def findHostByRoute():
try:
s.settimeout(5)
s.connect((server, port))
+ intf_tmp = s.getsockname()[0]
if family == AF_INET:
- intf = s.getsockname()[0]
+ intf = intf_tmp
else:
- intf6 = s.getsockname()[0]
- hostname = socket.getfqdn(server)
+ intf6 = intf_tmp
+ hostname = socket.getfqdn(intf_tmp)
except socket.error:
s.close()
continue
12 years, 3 months
Changes to 'refs/tags/spacewalk-search-1.6.6-1'
by Martin Minar
Tag 'spacewalk-search-1.6.6-1' created by Martin Minar <mminar(a)redhat.com> at 2011-11-30 12:59 +0000
Tagging package [spacewalk-search] version [1.6.6-1] in directory [search-server/spacewalk-search/].
Changes since rhncfg-5.10.21-1:
Martin Minar (2):
jakarta-oro package in Fedora 16 no longer provides oro dependency. Let's require jakarta-oro instead of oro.
Automatic commit of package [spacewalk-search] release [1.6.6-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
---
12 years, 3 months
rel-eng/packages search-server/spacewalk-search
by Martin Minar
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 908e75aeacbad86705a540a156de7c9a4c894be3
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Nov 30 13:59:05 2011 +0100
Automatic commit of package [spacewalk-search] release [1.6.6-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 7158f16..755c486 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.6.5-1 search-server/spacewalk-search/
+1.6.6-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 0aeb52a..2c86b77 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.6.5
+Version: 1.6.6
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -124,6 +124,10 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Wed Nov 30 2011 Martin Minar <mminar(a)redhat.com> 1.6.6-1
+- jakarta-oro package in Fedora 16 no longer provides oro dependency. Let's
+ require jakarta-oro instead of oro. (mminar(a)redhat.com)
+
* Mon Oct 24 2011 Jan Pazdziora 1.6.5-1
- 745102 - fixing typo.
12 years, 3 months
search-server/spacewalk-search
by Martin Minar
search-server/spacewalk-search/spacewalk-search.spec | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 95ca6529d58646c5e78fa2832697afa7fe589181
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Nov 30 13:53:32 2011 +0100
jakarta-oro package in Fedora 16 no longer provides oro dependency. Let's require jakarta-oro instead of oro.
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 434281f..0aeb52a 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -29,7 +29,11 @@ Requires: jakarta-commons-logging
%endif
Requires: jpackage-utils >= 0:1.5
Requires: log4j
+%if 0%{?fedora} >= 16
+Requires: jakarta-oro
+%else
Requires: oro
+%endif
#Requires: lucene
Requires: quartz
Requires: redstone-xmlrpc
@@ -50,7 +54,11 @@ BuildRequires: jakarta-commons-logging
%endif
BuildRequires: java-devel >= 1.6.0
BuildRequires: log4j
+%if 0%{?fedora} >= 16
+BuildRequires: jakarta-oro
+%else
BuildRequires: oro
+%endif
#BuildRequires: lucene
BuildRequires: quartz
BuildRequires: redstone-xmlrpc
12 years, 3 months
Changes to 'refs/tags/rhncfg-5.10.21-1'
by Miroslav Suchý
Tag 'rhncfg-5.10.21-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-30 12:46 +0000
Tagging package [rhncfg] version [5.10.21-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-schema-1.6.32-1:
Miroslav Suchý (2):
handle fs objects without selinux context correctly
Automatic commit of package [rhncfg] release [5.10.21-1].
---
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
12 years, 3 months
2 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 1fd2b3ee1924be613ad240fb08a08d3ff6f4d259
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 30 13:46:49 2011 +0100
Automatic commit of package [rhncfg] release [5.10.21-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 605f809..206641b 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.20
+Version: 5.10.21
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
+* Wed Nov 30 2011 Miroslav Suchý 5.10.21-1
+- handle fs objects without selinux context correctly
+
* Mon Nov 21 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.10.20-1
- 627490 - fixed cross device symlink backup
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 69ba182..6ada7b2 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.20-1 client/tools/rhncfg/
+5.10.21-1 client/tools/rhncfg/
commit 30bbbe8a30fe088c42f4d515ad3aad85ba9773a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 30 13:44:00 2011 +0100
handle fs objects without selinux context correctly
Traceback (most recent call last):
File "/usr/bin/rhncfg-client", line 34, in <module>
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_client/rhncfgcli_verify.py", line 83, in run
ret_dict = self._process_file(src, dst, file, ftype, file_info)
File "/usr/share/rhn/config_client/rhncfgcli_verify.py", line 250, in _process_file
dst_selinux = lgetfilecon(dst)[1]
OSError: [Errno 61] No data available
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index a87dc47..22d6195 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -247,7 +247,10 @@ class Handler(handler_base.HandlerBase):
src_selinux = info['selinux_ctx']
if src_selinux:
if not stat_err:
- dst_selinux = lgetfilecon(dst)[1]
+ try:
+ dst_selinux = lgetfilecon(dst)[1]
+ except OSError:
+ dst_selinux = ""
if dst_selinux == None:
dst_selinux = ""
else:
12 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.6.32-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.6.32-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-11-30 10:36 +0000
Tagging package [spacewalk-schema] version [1.6.32-1] in directory [schema/spacewalk/].
Changes since oracle-xe-selinux-10.2.0.23-1:
Milan Zazrivec (3):
rhnServerNetInterface: consistent not null constraints
rhnServerNetInterface: drop existing trigger before creating a modification
Automatic commit of package [spacewalk-schema] release [1.6.32-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql | 2 ++
4 files changed, 8 insertions(+), 3 deletions(-)
---
12 years, 3 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e1c6988113eb2e549bdddd2336cc182899239cc6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 30 11:36:49 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.32-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index e0c7156..52c9f63 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.31-1 schema/spacewalk/
+1.6.32-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 9d3f0bf..51b7d3b 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.31
+Version: 1.6.32
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Nov 30 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.32-1
+- pgsql: schema upgrade fixes
+
* Tue Nov 29 2011 Miroslav Suchý 1.6.31-1
- IPv6: in tables rhnRam, rhnCpu and rhnServerDMI allow only one record per
server
12 years, 3 months
2 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d8ba558b2d44a9a463ea7c23b673c9c23a9c50f4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 30 11:34:16 2011 +0100
rhnServerNetInterface: drop existing trigger before creating a modification
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
index 473e0d5..7cbe8a4 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
@@ -10,6 +10,8 @@ begin
end;
$$ language plpgsql;
+drop trigger if exists rhn_srv_net_iface_mod_trig on rhnServerNetInterface;
+
create trigger
rhn_srv_net_iface_mod_trig
before insert or update on rhnServerNetInterface
commit e88d88ae2eeafd388df8adcd718b5b8dfbd22999
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 30 11:32:50 2011 +0100
rhnServerNetInterface: consistent not null constraints
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle
index 1f0ab2a..b7ce233 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.oracle
@@ -4,6 +4,6 @@ create sequence rhn_srv_net_iface_id_seq;
update rhnServerNetInterface set id = rhn_srv_net_iface_id_seq.nextval;
-alter table rhnServerNetInterface add constraint rhn_srv_net_iface_id_nn check (id is not null);
+alter table rhnServerNetInterface modify id number not null;
alter table rhnServerNetInterface add constraint rhn_srv_net_iface_id_pk primary key ( id );
12 years, 3 months