Changeset 89c57b6 in mainline for tools/mktmpfs.py

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (4 diffs)

tools/mktmpfs.py

@@ -66 +66 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <PATH> <IMAGE>"
+        print(prname + " <PATH> <IMAGE>")
 
 def recursion(root, outf):
@@ -80 +80 @@
                         dentry.kind = TMPFS_FILE
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         dentry.flen = size
                         
                         outf.write(dentry.pack())
                         
-                        inf = file(canon, "r")
+                        inf = open(canon, "rb")
                         rd = 0;
                         while (rd < size):
@@ -97 +97 @@
                         dentry.kind = TMPFS_DIRECTORY
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         
                         outf.write(dentry.pack())
@@ -116 +116 @@
         path = os.path.abspath(sys.argv[1])
         if (not os.path.isdir(path)):
-                print "<PATH> must be a directory"
+                print("<PATH> must be a directory")
                 return
         
-        outf = file(sys.argv[2], "w")
+        outf = open(sys.argv[2], "wb")
         
         header = xstruct.create(HEADER)
-        header.tag = "TMPFS"
+        header.tag = b"TMPFS"
         
         outf.write(header.pack())