Changeset 49ff5f3 in mainline for tools/imgutil.py

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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/imgutil.py (modified) (2 diffs)

tools/imgutil.py

@@ -92 +92 @@
                 if name in exclude_names:
                         continue
+                
                 item = ItemToPack(path, name)
+                
                 if not (item.is_dir or item.is_file):
                         continue
+                
                 yield item
 
@@ -102 +105 @@
         inf = open(item.path, 'rb')
         rd = 0
+        
         while (rd < item.size):
                 data = bytes(inf.read(chunk_size))
                 yield data
                 rd += len(data)
+        
         inf.close()