rel-eng/packages spacewalk/certs-tools
by Michael Mraka
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7d53f18776fdecd02129968dc2f540007ac50109
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 19 14:19:02 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.6-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 1282b4d..54568f4 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.5-1 spacewalk/certs-tools/
+1.6.6-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 73ba3fc..bbaaf81 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.5
+Version: 1.6.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Oct 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.6-1
+- removed dead function getCertValidityRange()
+- removed dead function getCertValidityDates()
+- removed dead function getExistingOverridesConfig()
+
* Fri Sep 30 2011 Jan Pazdziora 1.6.5-1
- 689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
12 years, 8 months
6 commits - client/tools spacewalk/certs-tools
by Michael Mraka
client/tools/rhnpush/test/testUtils.py | 5 --
client/tools/rhnpush/utils.py | 5 --
spacewalk/certs-tools/rhn_bootstrap.py | 50 ---------------------------
spacewalk/certs-tools/sslToolConfig.py | 15 --------
spacewalk/certs-tools/sslToolLib.py | 60 ---------------------------------
5 files changed, 135 deletions(-)
New commits:
commit c73e1efcb8054972ec11f85ba0fc23ab5c7d1f4e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function getCertValidityRange()
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 0a12c83..1af82dd 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -122,49 +122,6 @@ def chdir(newdir):
return cwd
-##
-## common.rhnLib stuff that I duplicate here to make the tool "stand-alone"
-##
-
-def getCertValidityRange(certPath, daysYN=0):
- """ parse a cert (x509) and snag the validity range.
- Returns (notBefore, notAfter) in seconds or days the epoch.
- """
- certPath = cleanupAbsPath(certPath)
- if not os.path.exists(certPath):
- return None, None
-
- args = "/usr/bin/openssl x509 -dates -noout -in %s" % certPath
- ret, out_stream, err_stream = rhn_popen(args)
-
- out = out_stream.read(); out_stream.close()
- err = err_stream.read(); err_stream.close()
-
- out = string.strip(out)
-
- if ret or not out:
- raise RhnSslToolException("certificate parse (for validity range) "
- "failed:\n%s\n%s" % (out, err))
-
- if out \
- and string.find(out, 'notBefore=')!=-1 \
- and string.find(out, 'notAfter=')!=-1:
- notBefore, notAfter = string.split(out, '\n')
- notBefore = string.strip(string.split(notBefore, 'notBefore=')[1])[:-4]
- notAfter = string.strip(string.split(notAfter, 'notAfter=')[1])[:-4]
- # secs from epoch
- notBefore = str2secs(notBefore, '%b %d %H:%M:%S %Y')
- notAfter = str2secs(notAfter, '%b %d %H:%M:%S %Y')
- if daysYN:
- # days from epoch
- notBefore = secs2days(notBefore)
- notAfter = secs2days(notAfter)
- return notBefore, notAfter
- else:
- raise RhnSslToolException("certificate parse (for validity range) "
- "failed:\n%s\n%s" % (out, err))
-
-
class TempDir:
""" temp directory class with a cleanup destructor and method """
commit 85a799b1bc6b6c60a148b2790e99e7e08edda468
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function getCertValidityDates()
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 262d988..0a12c83 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -165,23 +165,6 @@ def getCertValidityRange(certPath, daysYN=0):
"failed:\n%s\n%s" % (out, err))
-def getCertValidityDates(certPath, format="%a %b %d %H:%M:%S %Y"):
- """ parse a cert (x509) and snag the validity dates.
- Returns (notBefore, notAfter) - strings of course.
- """
-
- # validity in seconds
- notBefore, notAfter = getCertValidityRange(certPath)
-
- if notBefore is not None:
- notBefore = secs2str(format, notBefore)
- if notAfter is not None:
- notAfter = secs2str(format, notAfter)
-
- # validity as strings
- return notBefore, notAfter
-
-
class TempDir:
""" temp directory class with a cleanup destructor and method """
commit d092e6c796c849054b85a9bd28575a16b7936f3a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:16:09 2011 +0100
removed dead function getExistingOverridesConfig()
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index 6800f2e..cc92fe2 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -125,56 +125,6 @@ def parseHttpProxyString(httpProxy):
return httpProxy
-def getExistingOverridesConfig(overrides):
- """ Fetch previously set values from the overrides file.
- These values will be used to set the defaults for the commandline.
- Sensible defaults are chosen for any settings left blank.
- FIXME: I don't use this yet.
- """
-
- d = {
- 'enableProxy': None,
- 'enableProxyAuth': None,
- 'httpProxy': None,
- 'proxyUser': None,
- 'proxyPassword': None,
- 'serverURL': '',
- 'sslCACert': '',
- 'useGPG': 1,
- }
- if os.path.exists(overrides):
- d.update(readConfigFile(overrides))
-
- # now let's fill in any blanks with sensible defaults.
- if not d['serverURL']:
- d['serverURL'] = 'https://' + socket.gethostname() + '/XMLRPC'
-
- d['sslCACert'] = d['sslCACert'] or DEFAULT_CA_CERT_PATH
-
- # http_proxy can be one of None, '' or 'something:port'
- # None means leave the configuration alone.
- # '' or 'something:port' means remap it.
- if d['httpProxy'] == '':
- d['proxyUser'] = ''
- d['enableProxy'] = 0
- elif d['httpProxy'] is None:
- d['proxyUser'] = None
- d['enableProxy'] = None # means no change
- else:
- d['enableProxy'] = 1
-
- if d['proxyUser'] == '':
- d['proxyPassword'] = ''
- d['enableProxyAuth'] = 0
- elif d['proxyUser'] is None:
- d['proxyPassword'] = None
- d['enableProxyAuth'] = None # means no change
- else:
- d['enableProxyAuth'] = 1
-
- return d
-
-
def processCACertPath(options):
isRpmYN = 0
commit 0d746c2a801e7b8e8203fccbf9479ce68b296b92
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:11:05 2011 +0100
removed test for already removed object_has_attr()
diff --git a/client/tools/rhnpush/test/testUtils.py b/client/tools/rhnpush/test/testUtils.py
index 1d1bfa7..80ab30a 100644
--- a/client/tools/rhnpush/test/testUtils.py
+++ b/client/tools/rhnpush/test/testUtils.py
@@ -60,11 +60,6 @@ class UtilsTestCase(unittest.TestCase):
self.obj1, self.obj2 = utils.make_common_attr_equal(self.obj1,self.obj2)
assert self.obj1._d == '1' and self.obj2._d == '4' and self.obj1.a == 4 and self.obj1.b == 5 and self.obj1.c == 6 and self.obj2.f == 'aaa'
-
-
- def testObjectHasAttr(self):
- assert utils.object_has_attr( self.obj1, 'a') == True and utils.object_has_attr( self.obj1, 'd') == False
-
def testAttrNotFunction(self):
assert utils.attr_not_function(self.obj1.__dict__['a']) == True
commit 3d4bd747f8e9dd32dd01e98f125eea7c15fbdc34
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:07:03 2011 +0100
removed dead functions
diff --git a/spacewalk/certs-tools/sslToolConfig.py b/spacewalk/certs-tools/sslToolConfig.py
index bae5b19..bb53ddf 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -149,21 +149,6 @@ def reInitDEFS(caYN=0):
DEFS.update(_defsServer)
-def printDEFS(defs=None):
- if not defs:
- defs = DEFS
- print 'XXX DEFS:'
- for k,v in defs.items():
- print k, ' '*(25-len(k)), repr(v)
-
-
-def printOptions(options):
- print 'XXX options:'
- if options:
- for k, v in options.__dict__.items():
- print k, ' '*(25-len(k)), repr(v)
-
-
def figureDEFS_dirs(options):
""" figure out the directory defaults (after options being at least parsed
once).
commit 3ec1a5683dc85c1443946f22e0de9e61f2b0f389
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 13:58:15 2011 +0100
removed dead function object_has_attr()
diff --git a/client/tools/rhnpush/utils.py b/client/tools/rhnpush/utils.py
index 0b687f8..d53a578 100644
--- a/client/tools/rhnpush/utils.py
+++ b/client/tools/rhnpush/utils.py
@@ -21,11 +21,6 @@ def get_home_dir():
info = pwd.getpwuid(userid)
return info[5]
-#Check to see if obj1 has an attribute named attr_name.
-#attr_name is a string and can denote a method or a member variable.
-def object_has_attr(obj1, attr_name):
- return obj1.__dict__.has_key(attr_name)
-
#If Object1 and Object2 have any common attributes, set the attribute in Object1
#to the value of the attribute in Object2. Does not make functions or variables starting with '_' equivalent.
def make_common_attr_equal(object1, object2):
12 years, 8 months
Changes to 'refs/tags/rhncfg-5.10.18-1'
by Milan Zazrivec
Tag 'rhncfg-5.10.18-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-10-19 12:13 +0000
Tagging package [rhncfg] version [5.10.18-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-setup-jabberd-1.6.3-1:
Milan Zazrivec (1):
Automatic commit of package [rhncfg] release [5.10.18-1].
---
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 8 months
client/tools rel-eng/packages
by Milan Zazrivec
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a5ac7a60f4353101f64563ee2de470188ae4e7c7
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 19 14:13:14 2011 +0200
Automatic commit of package [rhncfg] release [5.10.18-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 1ce821a..9332835 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.17
+Version: 5.10.18
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 Oct 19 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.18-1
+- 743424 - rhncfg-client diff: do not fail when not a valid symlink
+
* Mon Oct 10 2011 Jan Pazdziora 5.10.17-1
- 743424 - rhncfg-client diff: don't traceback on missing symlink
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index e1bbfaa..1139db9 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.17-1 client/tools/rhncfg/
+5.10.18-1 client/tools/rhncfg/
12 years, 8 months
Changes to 'refs/tags/spacewalk-setup-jabberd-1.6.3-1'
by Milan Zazrivec
Tag 'spacewalk-setup-jabberd-1.6.3-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-10-19 11:19 +0000
Tagging package [spacewalk-setup-jabberd] version [1.6.3-1] in directory [spacewalk/spacewalk-setup-jabberd/].
Changes since rhn-client-tools-1.6.25-1:
Milan Zazrivec (2):
spacewalk-setup-jabberd: update router.xml configuration
Automatic commit of package [spacewalk-setup-jabberd] release [1.6.3-1].
---
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 8 months
rel-eng/packages spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c771ad0f7787f49818b15bbed6b0b49514faa32a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 19 13:19:32 2011 +0200
Automatic commit of package [spacewalk-setup-jabberd] release [1.6.3-1].
diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd
index f798f5e..097446d 100644
--- a/rel-eng/packages/spacewalk-setup-jabberd
+++ b/rel-eng/packages/spacewalk-setup-jabberd
@@ -1 +1 @@
-1.6.2-1 spacewalk/spacewalk-setup-jabberd/
+1.6.3-1 spacewalk/spacewalk-setup-jabberd/
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index 5fb919d..3fee8a8 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-jabberd
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
Summary: Tools to setup jabberd for Spacewalk
Group: Applications/System
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Wed Oct 19 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.3-1
+- spacewalk-setup-jabberd: update router.xml configuration
+
* Fri Oct 07 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.2-1
- 715299 - jabberd IPv6 configuration
12 years, 8 months
spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2c1cd81b56b80fc397ffe0aafa9e742f7e210db9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 19 13:09:16 2011 +0200
spacewalk-setup-jabberd: update router.xml configuration
diff --git a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
index 70a8040..50be348 100755
--- a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
+++ b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
@@ -61,7 +61,7 @@ if ($macros) {
}
}
-foreach my $basename ('c2s', 's2s', 'sm') {
+foreach my $basename ('c2s', 's2s', 'sm', 'router') {
my $configfile = "/etc/jabberd/$basename.xml";
my $template = "/usr/share/spacewalk/setup/jabberd/$basename.xsl";
12 years, 8 months
Changes to 'refs/tags/rhn-client-tools-1.6.25-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.6.25-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-10-19 10:43 +0000
Tagging package [rhn-client-tools] version [1.6.25-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-schema-1.6.23-1:
Milan Zazrivec (2):
745438 - up2date_config: use localhost to avoid confusion
743424 - rhncfg-client diff: do not fail when not a valid symlink
Miroslav Suchý (3):
743259 - get_ipv6_addresses does not return one item, but list
743259 - RHEL5 now has python-ethtool 0.6 - simplify code
Automatic commit of package [rhn-client-tools] release [1.6.25-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 12 +++++++-----
client/rhel/rhn-client-tools/src/actions/up2date_config.py | 2 +-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 12 +++++-------
client/tools/rhncfg/config_client/rhncfgcli_diff.py | 4 ++++
rel-eng/packages/rhn-client-tools | 2 +-
5 files changed, 18 insertions(+), 14 deletions(-)
---
12 years, 8 months
3 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 12 +++++++-----
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 12 +++++-------
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d1e29c920e5f82c4ee34c7603a6c9d329b775035
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 19 12:43:42 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.25-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 447c87e9..184dd51 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.6.24
+Version: 1.6.25
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,12 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Oct 19 2011 Miroslav Suchý 1.6.25-1
+- 743259 - RHEL5 now has python-ethtool 0.6 - simplify code
+- 743259 - get_ipv6_addresses does not return one item, but list
+- 745438 - up2date_config: use localhost to avoid confusion
+ (mzazrivec(a)redhat.com)
+
* Tue Oct 18 2011 Miroslav Suchý 1.6.24-1
- move errata.py action to the yum-rhn-plugin package (iartarisi(a)suse.cz)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ec2a243..b938d9b 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.24-1 client/rhel/rhn-client-tools/
+1.6.25-1 client/rhel/rhn-client-tools/
commit bc83988eb4d47db439f3226198cee039075ec396
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 19 12:42:27 2011 +0200
743259 - RHEL5 now has python-ethtool 0.6 - simplify code
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 15e1b4a..447c87e9 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -15,11 +15,7 @@ BuildRequires: update-desktop-files
Requires: rhnlib >= 2.5.41
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Requires: python-ethtool
-%else
Requires: python-ethtool >= 0.4
-%endif
Requires: gnupg
Requires: sh-utils
%if 0%{?suse_version}
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 6bf588c..0ccc99e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -562,20 +562,17 @@ def read_network_interfaces():
broadcast = ethtool.get_broadcast(interface)
except:
broadcast = ""
-
+
ip6_list = []
- try:
- dev_info = ethtool.get_interfaces_info(interface)
- for info in dev_info:
- # one interface may have more IPv6 addresses
- for ip6 in info.get_ipv6_addresses():
- ip6_list.append({
- 'scope': ip6.scope,
- 'addr': ip6.address,
- 'netmask': ip6.netmask
- })
- except: #this will does not work on el5, ignore it
- pass
+ dev_info = ethtool.get_interfaces_info(interface)
+ for info in dev_info:
+ # one interface may have more IPv6 addresses
+ for ip6 in info.get_ipv6_addresses():
+ ip6_list.append({
+ 'scope': ip6.scope,
+ 'addr': ip6.address,
+ 'netmask': ip6.netmask
+ })
intDict[interface] = {'hwaddr':hwaddr,
'ipaddr':ipaddr,
'netmask':netmask,
commit 0cbbafd03376128946b3fd057044931128bd5586
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 19 12:40:42 2011 +0200
743259 - get_ipv6_addresses does not return one item, but list
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 0effffb..6bf588c 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -566,13 +566,14 @@ def read_network_interfaces():
ip6_list = []
try:
dev_info = ethtool.get_interfaces_info(interface)
- # one interface may have more IPv6 addresses
- for ip6 in dev_info.get_ipv6_addresses():
- ip6_list.append({
- 'scope': ip6.scope,
- 'addr': ip6.address,
- 'netmask': ip6.netmask
- })
+ for info in dev_info:
+ # one interface may have more IPv6 addresses
+ for ip6 in info.get_ipv6_addresses():
+ ip6_list.append({
+ 'scope': ip6.scope,
+ 'addr': ip6.address,
+ 'netmask': ip6.netmask
+ })
except: #this will does not work on el5, ignore it
pass
intDict[interface] = {'hwaddr':hwaddr,
12 years, 8 months
client/tools
by Milan Zazrivec
client/tools/rhncfg/config_client/rhncfgcli_diff.py | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit d58d87aa29cabe68983dfa02aa85dbba1e747d2c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Oct 19 12:26:37 2011 +0200
743424 - rhncfg-client diff: do not fail when not a valid symlink
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_diff.py b/client/tools/rhncfg/config_client/rhncfgcli_diff.py
index 18c38c7..e9170a6 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_diff.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_diff.py
@@ -30,6 +30,10 @@ class Handler(handler_base.HandlerBase):
print "Symbolic link '%s' is missing" % dst
return
+ if not os.path.islink(dst):
+ print "Path '%s' is not a symbolic link" % dst
+ return
+
#dst is a symlink, so just tell the user we're skipping the entry
srclink = os.readlink(src)
destlink = os.readlink(dst)
12 years, 8 months