Changeset 60898b6 in mainline for tools/mktmpfs.py

Timestamp:

2010-11-05T16:17:48Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

08042bd

Parents:

a63ff7d (diff), a66e2993 (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

@@ -66 +66 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <PATH> <IMAGE>"
+        print(prname + " <PATH> <IMAGE>")
 
 def recursion(root, outf):
@@ -85 +85 @@
                         outf.write(dentry.pack())
                         
-                        inf = file(canon, "r")
+                        inf = open(canon, "rb")
                         rd = 0;
                         while (rd < size):
@@ -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)