Changeset 4c53333 in mainline for tools/mkext2.py

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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) (5 diffs)

tools/mkext2.py

@@ -39 +39 @@
 import uuid
 from imgutil import *
+
+if sys.version >= '3':
+        xrange = range
 
 GDE_SIZE = 32
@@ -507 +510 @@
                 self.pos = align_up(self.pos, bytes)
         
+        def set_pos(self, pos):
+                "Set the current position"
+                
+                self.pos = pos
+        
         def pack(self):
                 "Pack the inode structure and return the result"
@@ -525 +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
@@ -562 +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)
 
@@ -581 +589 @@
                         if self.inode:
                                 self.prev_entry.write(self.inode)
+                                self.inode.set_pos(self.pos)
         
         def add(self, entry):