Changeset 98abd40 in mainline for tools/mkext2.py

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/mkext2.py (modified) (3 diffs)

tools/mkext2.py

@@ -39 +39 @@
 import uuid
 from imgutil import *
+
+if sys.version >= '3':
+        xrange = range
 
 GDE_SIZE = 32
@@ -530 +533 @@
                 data.flags = 0
                 blockconv = lambda x: 0 if x == None else x
-                data.direct_blocks = map(blockconv, self.direct)
-                data.indirect_blocks = map(blockconv, self.indirect)
+                data.direct_blocks = list(map(blockconv, self.direct))
+                data.indirect_blocks = list(map(blockconv, self.indirect))
                 data.version = 0
                 data.file_acl = 0
@@ -567 +570 @@
                 head.inode_type = self.type
                 inode.write(head.pack())
-                inode.write(self.name+'\0')
+                inode.write(self.name+'\0'.encode())
                 inode.align_pos(4)