Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6452/src
Modified Files:
config.py
Log Message:
Optimized and added cdrom[0-9]* to regexp, so it works in RH9
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** config.py 20 Aug 2003 21:25:21 -0000 1.39
--- config.py 20 Aug 2003 22:46:39 -0000 1.40
***************
*** 23,26 ****
--- 23,29 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.40 2003/08/20 22:46:39 gsbarbieri
+ # Optimized and added cdrom[0-9]* to regexp, so it works in RH9
+ #
# Revision 1.39 2003/08/20 21:25:21 dischi
# get SHARE_DIR earlier
***************
*** 347,364 ****
# Autodetect the CD/DVD drives in the system if not given in local_conf.py
if not ROM_DRIVES:
! if os.path.isfile('/etc/fstab'):
! RE_CD = '^(/dev/cdrom|/dev/a?cd\dc?)[ \t]+([^ \t]+)[ \t]+'
! RE_CDREC ='^(/dev/cdrecorder)[ \t]+([^ \t]+)[ \t]+'
! RE_DVD ='^(/dev/dvd)[ \t]+([^ \t]+)[ \t]+'
! RE_ISO ='^([^ \t]+)[ \t]+([^ \t]+)[ \t]+iso9660'
! RE_AUTOMOUNT = '^none[ \t]+([^ \t]+) supermount dev=([^,]+)'
fd_fstab = open('/etc/fstab')
for line in fd_fstab:
# Match on the devices /dev/cdrom, /dev/dvd, and fstype iso9660
! match_cd = re.compile(RE_CD, re.I).match(line)
! match_cdrec = re.compile(RE_CDREC, re.I).match(line)
! match_dvd = re.compile(RE_DVD, re.I).match(line)
! match_iso = re.compile(RE_ISO, re.I).match(line)
! match_automount = re.compile(RE_AUTOMOUNT, re.I).match(line)
mntdir = devname = ''
if match_cd:
--- 350,367 ----
# Autodetect the CD/DVD drives in the system if not given in local_conf.py
if not ROM_DRIVES:
! if os.path.isfile('/etc/fstab'):
! re_cd = re.compile( '^(/dev/cdrom[0-9]*|/dev/a?cd\dc?[0-9]*)[ \t]+([^
\t]+)[ \t]+', re.I )
! re_cdrec = re.compile( '^(/dev/cdrecorder[0-9]*)[ \t]+([^ \t]+)[ \t]+',
re.I )
! re_dvd = re.compile( '^(/dev/dvd[0-9]*)[ \t]+([^ \t]+)[ \t]+', re.I )
! re_iso = re.compile( '^([^ \t]+)[ \t]+([^ \t]+)[ \t]+iso9660', re.I )
! re_automount = re.compile( '^none[ \t]+([^ \t]+) supermount dev=([^,]+)',
re.I )
fd_fstab = open('/etc/fstab')
for line in fd_fstab:
# Match on the devices /dev/cdrom, /dev/dvd, and fstype iso9660
! match_cd = re_cd.match(line)
! match_cdrec = re_cdrec.match(line)
! match_dvd = re_dvd.match(line)
! match_iso = re_iso.match(line)
! match_automount = re_automount.match(line)
mntdir = devname = ''
if match_cd:
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
