Author: duncan
Date: Mon Jul 2 16:02:42 2007
New Revision: 9742
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/plugins/rom_drives.py
Log:
[ 1746613 ] traceback in rom_drives plugins
Fix applied
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Mon Jul 2 16:02:42 2007
@@ -37,6 +37,7 @@
* Fixed recordings manager not deleting old video when the disk is full
(B#1728182)
* Fixed recordings manager changing the menu context (B#1741842)
* Fixed recordserver causing stack traces when the record_schedule.xml is
empty (B#1733192)
+ * Fixed rom drive plug-in when the cd device cannot be opened (B#1746613)
* Fixed shopping cart to allow copying over existing read-only files
(B#1738914)
* Fixed tv recordings manager not deleting files when out of space (B#1728182)
* Fixed unicoding errors for media ids when there are Unicode (F#1731825)
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 Mon Jul 2 16:02:42 2007
@@ -316,13 +316,16 @@
# including refresh screen
try:
fd = os.open(self.devicename, os.O_RDONLY | os.O_NONBLOCK)
- if os.uname()[0] == 'FreeBSD':
- s = ioctl(fd, CDIOCCLOSE, 0)
- else:
- s = ioctl(fd, CDROMCLOSETRAY)
- self.tray_open = 0
- finally:
- os.close(fd)
+ try:
+ if os.uname()[0] == 'FreeBSD':
+ s = ioctl(fd, CDIOCCLOSE, 0)
+ else:
+ s = ioctl(fd, CDROMCLOSETRAY)
+ self.tray_open = 0
+ finally:
+ os.close(fd)
+ except Exception, e:
+ _debug_('Cannot open "%s": %s"' % (self.devicename, e),
config.DWARNING)
global im_thread
if im_thread:
-------------------------------------------------------------------------
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
