Changeset ea15a89a in mainline for tools/mkext2.py

Timestamp:

2013-04-29T14:26:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

533e2d7, 94dfb92

Parents:

b2fa2d86 (diff), 9e7898e (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) (2 diffs)

tools/mkext2.py

@@ -507 +507 @@
                 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"
@@ -581 +586 @@
                         if self.inode:
                                 self.prev_entry.write(self.inode)
+                                self.inode.set_pos(self.pos)
         
         def add(self, entry):