Author: duncan
Date: Sun May 27 15:15:32 2007
New Revision: 9619

Modified:
   branches/rel-1/freevo/src/plugins/rom_drives.py

Log:
Removed the traceback messages when a drive can't be opened or closed


Modified: branches/rel-1/freevo/src/plugins/rom_drives.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/rom_drives.py     (original)
+++ branches/rel-1/freevo/src/plugins/rom_drives.py     Sun May 27 15:15:32 2007
@@ -297,22 +297,10 @@
                     s = ioctl(fd, CDIOCEJECT, 0)
                 else:
                     s = ioctl(fd, CDROMEJECT)
+                self.tray_open = 1
+            finally:
                 os.close(fd)
-            except:
-                try:
-                    traceback.print_exc()
-                except IOError:
-                    # believe it or not, this sometimes causes an IOError if
-                    # you've got a music track playing in the background 
(detached)
-                    pass
-                # maybe we need to close the fd if ioctl fails, maybe
-                # open fails and there is no fd
-                try:
-                    os.close(fd)
-                except:
-                    pass
 
-            self.tray_open = 1
             if notify:
                 pop.destroy()
 
@@ -332,17 +320,10 @@
                     s = ioctl(fd, CDIOCCLOSE, 0)
                 else:
                     s = ioctl(fd, CDROMCLOSETRAY)
+                self.tray_open = 0
+            finally:
                 os.close(fd)
-            except:
-                traceback.print_exc()
-                # maybe we need to close the fd if ioctl fails, maybe
-                # open fails and there is no fd
-                try:
-                    os.close(fd)
-                except:
-                    pass
 
-            self.tray_open = 0
             global im_thread
             if im_thread:
                 im_thread.check_all()

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to