Changeset 403

Timestamp:

24-06-09 17:17:49 (4 years ago)

Author:

thomas

Message:

• moap/test/test_vcs_svn.py:
• moap/vcs/vcs.py: Fix for Python 2.3 by avoiding extractall, and working around a hardlinking bug in tarfile in python 2.3

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/test/test_vcs_svn.py (modified) (2 diffs)
• moap/vcs/vcs.py (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/test/test_vcs_svn.py:
+        * moap/vcs/vcs.py:
+          Fix for Python 2.3 by avoiding extractall, and working around
+          a hardlinking bug in tarfile in python 2.3
+
 2009-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/test/test_vcs_svn.py

@@ -8 +8 @@
 import tempfile
 
+from moap.util import log
 from moap.vcs import svn
 
@@ -268 +269 @@
     def assertBackupRestore(self):
         # do a backup and restore and check
-        fd, archive = tempfile.mkstemp(suffix='tar.gz', prefix="moap.test.")
+        fd, archive = tempfile.mkstemp(suffix='.tar.gz', prefix="moap.test.")
         os.close(fd)
 
         # backup does a test restore
+        log.debug('test', 'backing up archive %s', archive)
         self.vcs.backup(archive)
 

trunk/moap/vcs/vcs.py

@@ -350 +350 @@
         """
         mode = 'w:'
+        suffix = '.tar'
         if archive.endswith('.gz'):
             mode = 'w:gz'
+            suffix = '.tar.gz'
         if archive.endswith('.bz2'):
             mode = 'w:bw2'
-
+            suffix = '.tar.bz2'
+
+        # P2.4
+        # Pre-2.5, tarfile has a bug, creating hardlinks for temporary files
+        # if the temporary files get deleted right after adding.
+        # See http://mail.python.org/pipermail/python-bugs-list/2005-October/030793.html
+        # the workaround chosen is to keep the temporary files until after
+        # closing
         tar = tarfile.TarFile.open(name=archive, mode=mode)
 
         # store the diff
-        (fd, path) = tempfile.mkstemp(prefix='moap.backup.diff.')
+        (fd, diffpath) = tempfile.mkstemp(prefix='moap.backup.diff.')
         diff = self.diff('')
         if diff:
             os.write(fd, diff + '\n')
         os.close(fd)
-        tar.add(path, arcname='diff')
-        os.unlink(path)
+        tar.add(diffpath, arcname='diff')
 
         # store the checkout commands
-        (fd, path) = tempfile.mkstemp(prefix='moap.backup.checkout.')
+        (fd, checkoutpath) = tempfile.mkstemp(prefix='moap.backup.checkout.')
         os.write(fd, "#!/bin/sh\n" + self.getCheckoutCommands())
         os.close(fd)
-        os.chmod(path, 0755)
-        tar.add(path, arcname='checkout.sh')
-        os.unlink(path)
+        os.chmod(checkoutpath, 0755)
+        tar.add(checkoutpath, arcname='checkout.sh')
 
         # store the unignored files
@@ -384 +391 @@
             tar.add(abspath, 'unignored/' + rel)
         tar.close()
+        os.unlink(diffpath)
+        os.unlink(checkoutpath)
 
         # now verify the backup
-        restoreDir = tempfile.mkdtemp(prefix="moap.test.")
+        restoreDir = tempfile.mkdtemp(prefix="moap.test.restore.")
         os.rmdir(restoreDir)
         self.restore(archive, restoreDir)
@@ -414 +423 @@
         oldPath = os.getcwd()
 
+        # P2.3: tarfile.extractall only exists since 2.5
         tar = tarfile.TarFile.open(name=archive)
-        tar.extractall(path)
+        try:
+            tar.extractall(path)
+        except AttributeError:
+            # do it the shell way
+            self.debug('Restoring by using tar directly')
+            os.system('mkdir -p %s' % path)
+            if archive.endswith('.gz'):
+                os.system('cd %s; tar xzf %s' % (path, archive))
+            elif archive.endswith('.bz2'):
+                os.system('cd %s; tar xjf %s' % (path, archive))
+            else:
+                raise AssertionError("Don't know how to handle %s" % archive)
 
         # start with the checkout