rpms/system-config-network/devel system-config-network-1.5.92-vendorNULL.patch, NONE, 1.1 system-config-network.spec, 1.41, 1.42

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25575

Modified Files:
	system-config-network.spec 
Added Files:
	system-config-network-1.5.92-vendorNULL.patch 
Log Message:
fix bz 468355

system-config-network-1.5.92-vendorNULL.patch:

--- NEW FILE system-config-network-1.5.92-vendorNULL.patch ---
diff -up system-config-network-1.5.92/src/netconfpkg/NCBackendHal.py.BAD system-config-network-1.5.92/src/netconfpkg/NCBackendHal.py
--- system-config-network-1.5.92/src/netconfpkg/NCBackendHal.py.BAD	2008-10-27 14:25:30.000000000 -0400
+++ system-config-network-1.5.92/src/netconfpkg/NCBackendHal.py	2008-10-27 14:26:46.000000000 -0400
@@ -98,7 +98,9 @@ class NCBackendHal:
                 hw.Card = Card() 
                 hw.Name = name
                 hw.Type = htype
-                hw.Description = "%s %s" % self.getVendor(udi)
+                vendor = self.getVendor(udi)
+                if vendor != None:
+                    hw.Description = "%s %s" % vendor
                 hw.Status = HW_SYSTEM
 
                 index = self.getProperty(obj, "net.physical_device")


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-network.spec	27 Oct 2008 14:14:25 -0000	1.41
+++ system-config-network.spec	27 Oct 2008 18:34:37 -0000	1.42
@@ -2,9 +2,10 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.5.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-network-1.5.92-vendorNULL.patch
 License: GPLv2+
 Group: Applications/System 
 BuildArch: noarch
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -54,7 +56,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/networking/profiles/default
 
 %find_lang %name
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,6 +101,10 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> 
+- don't try to write out Description if vendor is NULL (bz 468355)
+  (thanks to Kazunori Asayama)
+
 * Mon Oct 27 2008 Matthias Clasen  <mclasen at redhat.com> 
 - Require usermode-gtk