Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29809/src
Modified Files:
config.py
Log Message:
Match (CD|DVD) by mount point
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** config.py 22 Aug 2003 17:51:29 -0000 1.41
--- config.py 23 Aug 2003 22:27:06 -0000 1.42
***************
*** 23,26 ****
--- 23,29 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.42 2003/08/23 22:27:06 gsbarbieri
+ # Match (CD|DVD) by mount point
+ #
# Revision 1.41 2003/08/22 17:51:29 dischi
# Some changes to make freevo work when installed into the system
***************
*** 305,308 ****
--- 308,313 ----
re_iso = re.compile( '^([^ \t]+)[ \t]+([^ \t]+)[ \t]+iso9660', re.I )
re_automount = re.compile( '^none[ \t]+([^ \t]+) supermount dev=([^,]+)',
re.I )
+ re_bymountcd = re.compile( '^(/dev/[^ \t]+)[ \t]+([^ ]*cdrom[0-9]*)[ \t]+',
re.I )
+ re_bymountdvd= re.compile( '^(/dev/[^ \t]+)[ \t]+([^ ]*dvd[0-9]*)[ \t]+',
re.I )
fd_fstab = open('/etc/fstab')
for line in fd_fstab:
***************
*** 313,320 ****
match_iso = re_iso.match(line)
match_automount = re_automount.match(line)
mntdir = devname = ''
! if match_cd:
! mntdir = match_cd.group(2)
! devname = match_cd.group(1)
dispname = 'CD-%s' % (len(ROM_DRIVES)+1)
elif match_cdrec:
--- 318,328 ----
match_iso = re_iso.match(line)
match_automount = re_automount.match(line)
+ match_bymountcd = re_bymountcd.match(line)
+ match_bymountdvd= re_bymountdvd.match(line)
mntdir = devname = ''
! if match_cd or match_bymountcd:
! m = match_cd or match_bymountcd
! mntdir = m.group(2)
! devname = m.group(1)
dispname = 'CD-%s' % (len(ROM_DRIVES)+1)
elif match_cdrec:
***************
*** 322,328 ****
devname = match_cdrec.group(1)
dispname = 'CDREC-%s' % (len(ROM_DRIVES)+1)
! elif match_dvd:
! mntdir = match_dvd.group(2)
! devname = match_dvd.group(1)
dispname = 'DVD-%s' % (len(ROM_DRIVES)+1)
elif match_iso:
--- 330,337 ----
devname = match_cdrec.group(1)
dispname = 'CDREC-%s' % (len(ROM_DRIVES)+1)
! elif match_dvd or match_bymountdvd:
! m = match_dvd or match_bymountdvd
! mntdir = m.group(2)
! devname = m.group(1)
dispname = 'DVD-%s' % (len(ROM_DRIVES)+1)
elif match_iso:
-------------------------------------------------------
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
