rpms/system-config-soundcard/devel system-config-soundcard-2.0.4-no-card.patch, NONE, 1.1 system-config-soundcard.spec, 1.48, 1.49

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16350

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.4-no-card.patch 
Log Message:
fixed crashing on box w/o sound card

system-config-soundcard-2.0.4-no-card.patch:
 soundcardBackendProc.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE system-config-soundcard-2.0.4-no-card.patch ---
--- system-config-soundcard-2.0.4/src/soundcardBackendProc.py.old	2006-10-16 16:09:15.000000000 +0200
+++ system-config-soundcard-2.0.4/src/soundcardBackendProc.py	2006-10-17 14:12:44.000000000 +0200
@@ -65,9 +65,12 @@
     def probeCards(self, default_card, default_device, card_list, card_max):
     
         driverList = self.read_driver_list()
-    
-        fd = open('/proc/asound/cards', 'r')
-        lines = fd.readlines()
+        try: 
+            fd = open('/proc/asound/cards', 'r')
+            lines = fd.readlines()
+	except:
+            return card_list
+ 
         fd.close()
 
         index = 0


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- system-config-soundcard.spec	16 Oct 2006 14:34:44 -0000	1.48
+++ system-config-soundcard.spec	17 Oct 2006 12:23:35 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.4
-Release: 1%{dist}
+Release: 2%{dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch:   system-config-soundcard-2.0.4-no-card.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 make
@@ -81,6 +83,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Mon Oct 17 2006 Martin Stransky <stransky at redhat.com> 2.0.4-2
+- fixed crashing on box w/o sound card
+
 * Mon Oct 16 2006 Martin Stransky <stransky at redhat.com> 2.0.4-1
 - fix for #210730: Crashes in certain locales