- tf.add(OS.path.join(dir, file), OS.path.join(root, base, file),
- recursive = False)
+ 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)