Bug#686197: unblock: rhnsd/4.9.15-1
Hi Adam,
> [...]
> (Leaving aside arguments as to whether we should be introducing new
> packages now, ) an unblock wouldn't help. There may not have been any
> bugs filed against the package but it /is/ buggy, which is why it failed
> to migrate during the month that it had an automatic exception:
thanks for the explanation - indeed I missed that piece while looking for
reasons why the migration did not happen and there was no bug, so nobody noticed
it. As python-ethtool will never work on !linux architectures, we've removed the
strict dependency on it in rhn-client-tools. The diff is rather simple, so I
would appreciate if you could unblock rhn-client-tools/1.8.9-2 instead. The diff
between -1 and -2 is attached.
Thanks,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c37f176
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+This Debian package uses quilt(1) for patch management.
+Please see /usr/share/doc/quilt/README.source for more information.
diff --git a/debian/changelog b/debian/changelog
index a8579c3..2d4ca4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rhn-client-tools (1.8.9-2) unstable; urgency=low
+
+ * [c611b6e2] Remove the dependency on !linux arches on python-ethtool.
+ * [bf0389ab] Add README.source.
+
+ -- Bernd Zeimetz <bzed@debian.org> Thu, 13 Sep 2012 00:55:56 +0200
+
rhn-client-tools (1.8.9-1) unstable; urgency=low
* Initial Debian release
diff --git a/debian/control b/debian/control
index da91206..5aa2e04 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: python
Priority: extra
Maintainer: Miroslav Suchý <miroslav@suchy.cz>
Uploaders: Bernd Zeimetz <bzed@debian.org>
-Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~), intltool
+Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~), intltool, quilt (>= 0.48-3~)
Standards-Version: 3.9.3
Homepage: https://fedorahosted.org/spacewalk
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/spacewalk/rhn-client-tools.git
Vcs-Git: git://anonscm.debian.org/collab-maint/spacewalk/rhn-clint-tools.git
Package: rhn-client-tools
-Architecture: all
+Architecture: any
Depends: ${python:Depends}, ${misc:Depends}, python-rhn (>= 2.5.40),
- python-ethtool, python-dbus, python-apt (>= 0.7.100), python-newt,
+ python-ethtool [linux-any], python-dbus, python-apt (>= 0.7.100), python-newt,
python-dmidecode, lsb-release, gnupg, python-gudev, debconf, python-openssl
Recommends: apt-spacewalk
Suggests: python-gnome2, python-gtk2, python-glade2
diff --git a/debian/patches/0001-workaround-missing-python-ethtool.patch b/debian/patches/0001-workaround-missing-python-ethtool.patch
new file mode 100644
index 0000000..353308c
--- /dev/null
+++ b/debian/patches/0001-workaround-missing-python-ethtool.patch
@@ -0,0 +1,42 @@
+From 8baef61c8b6b9564e7e936f52575d5eb75b5ee38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
+Date: Thu, 30 Aug 2012 10:53:01 +0200
+Subject: [PATCH] workaround missing python-ethtool
+
+On Debian/kfreebsd is not available python-ethtoool. It is because it requires libnl,
+which is Linux specific.
+So if python-ethtools is not present, do not fail and just print warning,
+that hardware information about network interfaces are not present.
+And read_network_interfaces() will return empty dictionary.
+---
+ .../rhel/rhn-client-tools/src/up2date_client/hardware.py | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/src/up2date_client/hardware.py
++++ b/src/up2date_client/hardware.py
+@@ -22,7 +22,13 @@ import os
+ import sys
+ import config
+
+-import ethtool
++try:
++ import ethtool
++ ethtool_present = True
++except ImportError:
++ sys.stderr.write("Warning: information about network interfaces could not be retrieved on this platform.\n")
++ ethtool_present = False
++
+ import gettext
+ t = gettext.translation('rhn-client-tools', fallback=True)
+ _ = t.ugettext
+@@ -524,6 +530,10 @@ def read_network_interfaces():
+ intDict = {}
+ intDict['class'] = "NETINTERFACES"
+
++ if not ethtool_present:
++ # ethtool is not available on non-linux platforms (as kfreebsd), skip it
++ return intDict
++
+ interfaces = list(set(ethtool.get_devices() + ethtool.get_active_devices()))
+ for interface in interfaces:
+ try:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d5110c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-workaround-missing-python-ethtool.patch
diff --git a/debian/rules b/debian/rules
index 33dad7d..1f3b0f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ override_dh_auto_install:
rm -rf $(CURDIR)/debian/$(PACKAGENAME)/etc/security
rmdir $(CURDIR)/debian/$(PACKAGENAME)/etc/yum.repos.d
+override_dh_auto_test:
+ $(MAKE) $(params) test
+
%:
- dh $@ --with python2
+ dh $@ --with python2,quilt
Reply to: