diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-16 12:31:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-16 12:31:47 -0400 |
| commit | 2c97cf3add00bdaadecd4e581dff2d7b30437c33 (patch) | |
| tree | 8c29ca922950988f6bb768f1700c9872bbba7ae5 | |
| parent | 3430b487d68a8af131e23fa417f7635e1cbaf3c8 (diff) | |
| parent | 619178bb3a0005af4b1f44ff58aded4202388597 (diff) | |
| download | tor-2c97cf3add00bdaadecd4e581dff2d7b30437c33.tar.gz tor-2c97cf3add00bdaadecd4e581dff2d7b30437c33.zip | |
Merge remote-tracking branch 'tor-github/pr/1329'
| -rw-r--r-- | changes/ticket31336 | 3 | ||||
| -rwxr-xr-x | scripts/maint/add_c_file.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changes/ticket31336 b/changes/ticket31336 new file mode 100644 index 0000000000..c5a013699f --- /dev/null +++ b/changes/ticket31336 @@ -0,0 +1,3 @@ + o Minor bugfixes (developer tools): + - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug + 31336; bugfix on 0.4.1.2-alpha. diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py index adf7ce79bb..a773fd0fff 100755 --- a/scripts/maint/add_c_file.py +++ b/scripts/maint/add_c_file.py @@ -15,9 +15,7 @@ import time def topdir_file(name): """Strip opening "src" from a filename""" - if name.startswith("src/"): - name = name[4:] - return name + return os.path.relpath(name, './src') def guard_macro(name): """Return the guard macro that should be used for the header file 'name'. |