Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
builder.py: correctly set $3 to include the subdir path.
If we're using a .do file from a parent directory, we should set $3 using the same path prefix as $1. We were previously using just the basename, which mostly works (since we would rename it to $1$2 eventually anyway) but is not quite right, and you can't safely rename files across filesystems, so it could theoretically cause problems. Also improved t/defaults-nested to test for this behaviour. Reported by Eric Kow.
- Loading branch information
Showing
3 changed files
with
15 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
echo root $1 $2 | ||
|
||
echo root $1 $2 "$(dirname $3)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters