Changeset bd5f3b7 in mainline for tools/mktmpfs.py

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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) (2 diffs)

tools/mktmpfs.py

@@ -35 +35 @@
 import os
 import xstruct
-
-exclude_names = set(['.svn', '.bzr'])
+from imgutil import listdir_items, chunks
 
 HEADER = """little:
@@ -71 +70 @@
         "Recursive directory walk"
         
-        for name in os.listdir(root):
-                canon = os.path.join(root, name)
-                
-                if (os.path.isfile(canon) and (not name in exclude_names)):
-                        size = os.path.getsize(canon)
-                        
-                        dentry = xstruct.create(DENTRY_FILE % len(name))
+        for item in listdir_items(root):                
+                if item.is_file:                        
+                        dentry = xstruct.create(DENTRY_FILE % len(item.name))
                         dentry.kind = TMPFS_FILE
-                        dentry.fname_len = len(name)
-                        dentry.fname = name.encode('ascii')
-                        dentry.flen = size
+                        dentry.fname_len = len(item.name)
+                        dentry.fname = item.name.encode('ascii')
+                        dentry.flen = item.size
                         
                         outf.write(dentry.pack())
                         
-                        inf = open(canon, "rb")
-                        rd = 0;
-                        while (rd < size):
-                                data = inf.read(4096);
+                        for data in chunks(item, 4096):
                                 outf.write(data)
-                                rd += len(data)
-                        inf.close()
                 
-                if (os.path.isdir(canon) and (not name in exclude_names)):
-                        dentry = xstruct.create(DENTRY_DIRECTORY % len(name))
+                elif item.is_dir:
+                        dentry = xstruct.create(DENTRY_DIRECTORY % len(item.name))
                         dentry.kind = TMPFS_DIRECTORY
-                        dentry.fname_len = len(name)
-                        dentry.fname = name.encode('ascii')
+                        dentry.fname_len = len(item.name)
+                        dentry.fname = item.name.encode('ascii')
                         
                         outf.write(dentry.pack())
                         
-                        recursion(canon, outf)
+                        recursion(item.path, outf)
                         
                         dentry = xstruct.create(DENTRY_NONE)