do/ directory, fix relative paths when do/ is a symlink

mildred · Mar 14, 2014 · cf04c6a · cf04c6a
1 parent dd769d0
commit cf04c6a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/builder.py b/builder.py
@@ -36,7 +36,17 @@ def _possible_do_files(t):
 def _possible_do_files_in_do_dir(t):
     for dodir,dofile,basedir,basename,ext in _possible_do_files(t):
         yield (dodir,dofile,basedir,basename,ext)
-        yield (os.path.join(dodir, "do"), dofile, os.path.join("..", basedir), os.path.join("..", basename), ext)
+
+        dodir2 = os.path.join(dodir, "do")
+        if os.path.islink(dodir2):
+            dodir2 = os.path.realpath(dodir2)
+            d = os.path.relpath(os.path.abspath(dodir), dodir2)
+            basedir2 = os.path.join(d, basedir)
+            basename2= os.path.join(d, basename)
+        else:
+            basedir2 = os.path.join("..", basedir)
+            basename2= os.path.join("..", basename)
+        yield (dodir2, dofile, basedir2, basename2, ext)
 
 def _find_do_file(f):
     for dodir,dofile,basedir,basename,ext in _possible_do_files_in_do_dir(f.name):

diff --git a/t/560-dodir-symlink/all.do b/t/560-dodir-symlink/all.do
@@ -0,0 +1 @@
+redo toto
diff --git a/t/560-dodir-symlink/dir/dodir/toto.do b/t/560-dodir-symlink/dir/dodir/toto.do
@@ -0,0 +1,2 @@
+echo $$ >$3
+cat $2.src >>$3
diff --git a/t/560-dodir-symlink/do b/t/560-dodir-symlink/do
@@ -0,0 +1 @@
+dir/dodir
diff --git a/t/560-dodir-symlink/toto.src b/t/560-dodir-symlink/toto.src
@@ -0,0 +1 @@
+toto.src