Changeset d011038 in mainline for tools/mkfat.py

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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

@@ -211 +211 @@
         dir_entry = xstruct.create(DIR_ENTRY)
         
-        dir_entry.name = mangle_fname(name)
-        dir_entry.ext = mangle_ext(name)
+        dir_entry.name = mangle_fname(name).encode('ascii')
+        dir_entry.ext = mangle_ext(name).encode('ascii')
         
         if (directory):
@@ -239 +239 @@
         
         dir_entry.signature = 0x2e
-        dir_entry.name = '       '
-        dir_entry.ext = '   '
+        dir_entry.name = b'       '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10
         
@@ -258 +258 @@
         
         dir_entry.signature = [0x2e, 0x2e]
-        dir_entry.name = '      '
-        dir_entry.ext = '   '
+        dir_entry.name = b'      '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10