Ticket #4467: mythburn_patch_fix_ValueError.patch

.py

@@ -14 +14 @@
 # paulh
 # 4 May 2006 - Added into mythtv svn
 
+# banyan
+# 14 Jan 2008 - Fixed issue in CopyRemote causing the following exception:
+#       ValueError: too many values to unpack
+#    Cause: a mount with spaces in the path split into more than 6 parts.
+#    This caused the assignment of the parts to fail later.  
+#    Solution: replaced the split() and assignment with a regular expression.
+
 #For this script to work you need to have...
 #Python2.3.5
 #python2.3-mysqldb
@@ -31 +38 @@
 #******************************************************************************
 
 # version of script - change after each update
-VERSION="0.1.20071115-1.fixes"
+VERSION="0.1.20080114-1.fixes"
 
 
 ##You can use this debug flag when testing out new themes
@@ -55 +62 @@
 import Image, ImageDraw, ImageFont
 import MySQLdb, codecs
 import time, datetime, tempfile
+import re
 from fcntl import ioctl
 from CDROM import CDROMEJECT
 from CDROM import CDROMCLOSETRAY
@@ -3294 +3302 @@
     mounts = os.popen('mount')
     # Go through each line of mounts output
     for line in mounts.readlines():
-        parts = line.split()
         # mount says in this format
-        device, txt1, mountpoint, txt2, filesystem, options = parts
+        m = re.match(r"(.*)( on )(.*)( type )(.*)\s(\(.*\))", line)
+        assert m, "Could not parse the mount line:\n\t%s" % line
+        device, txt1, mountpoint, txt2, filesystem, options = m.group(1),"on",m.group(3),"type",m.group(5),m.group(6)
         # only do if really remote
         if filesystem in remotefs:
             # add remote to list