X-Git-Url: https://git.distorted.org.uk/~mdw/chopwood/blobdiff_plain/fde8f8a7aef47d31546f2a38054db7704c32a47f..efe96413119f689752c6395c68531b17b70c2743:/agpl.py

diff --git a/agpl.py b/agpl.py
index caed713..0929e78 100644
--- a/agpl.py
+++ b/agpl.py
@@ -23,6 +23,8 @@
 ### License along with Chopwood; if not, see
 ### <http://www.gnu.org/licenses/>.
 
+from __future__ import with_statement
+
 import contextlib as CTX
 import grp as GR
 import os as OS
@@ -198,28 +200,27 @@ def dump_dir(name, dir, dirmap, tf, root):
 
     ## Work through each file.
     for file in lister(dir):
-      full = OS.path.join(dir, file)
-      tarname = OS.path.join(root, name, file)
-      skip = False
-
-      ## Check for symbolic links.  If we find one that points to another
-      ## directory we're going to dump separately then fiddle it so that it
-      ## works in the directory tree we're going to make.
-      if OS.path.islink(full):
-        dest = OS.path.realpath(full)
-        for d, local in dirmap:
-          if dest.startswith(d):
-            fix = OS.path.relpath(OS.path.join('/', local, dest[len(d):]),
-                                  OS.path.join('/', name,
-                                               OS.path.dirname(file)))
-            st = OS.stat(full)
-            ti = tf.gettarinfo(full, tarname)
-            ti.linkname = fix
-            tf.addfile(ti)
-            skip = True
-
-      ## Nothing special, so just dump the file.  Or whatever it is.
-      if not skip:
+      with U.Escape() as skip:
+        full = OS.path.join(dir, file)
+        tarname = OS.path.join(root, name, file)
+
+        ## Check for symbolic links.  If we find one that points to another
+        ## directory we're going to dump separately then fiddle it so that it
+        ## works in the directory tree we're going to make.
+        if OS.path.islink(full):
+          dest = OS.path.realpath(full)
+          for d, local in dirmap:
+            if dest.startswith(d):
+              fix = OS.path.relpath(OS.path.join('/', local, dest[len(d):]),
+                                    OS.path.join('/', name,
+                                                 OS.path.dirname(file)))
+              st = OS.stat(full)
+              ti = tf.gettarinfo(full, tarname)
+              ti.linkname = fix
+              tf.addfile(ti)
+              skip()
+
+        ## Nothing special, so just dump the file.  Or whatever it is.
         tf.add(full, tarname, recursive = False)
 
 def source(out):