Changeset e6a78b9 in mainline for tools/mkfat.py

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• tools/mkfat.py (modified) (3 diffs)

tools/mkfat.py

@@ -189 +189 @@
         "Filter FAT legal characters"
         
-        filtered_name = ''
+        filtered_name = b''
         filtered = False
         
@@ -205 +205 @@
         
         ascii_name, lfn = fat_lchars(name)
-        ascii_parts = ascii_name.split('.')
+        # Splitting works only on strings, not on bytes
+        ascii_parts = ascii_name.decode('utf8').split('.')
         
         short_name = ''
@@ -444 +445 @@
         extra_bytes = int(sys.argv[1])
         
-        path = os.path.abspath(sys.argv[2].decode())
+        path = os.path.abspath(sys.argv[2])
         if (not os.path.isdir(path)):
                 print("<PATH> must be a directory")