Changeset 70709 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 23, 2018 3:27:27 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120452

Message:

common/utils.py: Untar fix for python 3.6 and later.

File:

• trunk/src/VBox/ValidationKit/common/utils.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -1856 +1856 @@
 g_fTarCopyFileObjOverriddend = False;
 
-def __mytarfilecopyfileobj(src, dst, length = None, exception = OSError):
+def __mytarfilecopyfileobj(src, dst, length = None, exception = OSError, bufsize = None):
     """ tarfile.copyfileobj with different buffer size (16384 is slow on windows). """
     if length is None:
@@ -1896 +1896 @@
         if g_fTarCopyFileObjOverriddend is False:
             g_fTarCopyFileObjOverriddend = True;
+            #if sys.hexversion < 0x03060000:
             tarfile.copyfileobj = __mytarfilecopyfileobj;
 
@@ -1904 +1905 @@
     #       That's how we got a 13 min unpack time for VBoxAll on windows (hardlinked pdb).
     #
-    try: oTarFile = tarfile.open(sArchive, 'r|*', bufsize = g_cbGoodBufferSize);
+    try:
+        if sys.hexversion >= 0x03060000:
+            oTarFile = tarfile.open(sArchive, 'r|*', bufsize = g_cbGoodBufferSize, copybufsize = g_cbGoodBufferSize);
+        else:
+            oTarFile = tarfile.open(sArchive, 'r|*', bufsize = g_cbGoodBufferSize);
     except Exception as oXcpt:
         fnError('Error opening "%s" for unpacking into "%s": %s' % (sArchive, sDstDir, oXcpt,));