Changeset 8b655705 in mainline for tools/mktmpfs.py

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/mktmpfs.py (modified) (3 diffs)

tools/mktmpfs.py

@@ -80 +80 @@
                         dentry.kind = TMPFS_FILE
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         dentry.flen = size
                         
@@ -97 +97 @@
                         dentry.kind = TMPFS_DIRECTORY
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         
                         outf.write(dentry.pack())
@@ -122 +122 @@
         
         header = xstruct.create(HEADER)
-        header.tag = "TMPFS"
+        header.tag = b"TMPFS"
         
         outf.write(header.pack())