nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

add_c_file: Replace asserts with exceptions

Browse Source 
Closes 32962.
This commit is contained in:
teor 2020-01-20 13:20:42 +10:00
parent 2c75d4a8d0
commit 28c8c63de9
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/maint/add_c_file.py
View File

@ -268,15 +268,26 @@ def run(fname):
# Make sure we're in the top-level tor directory, # Make sure we're in the top-level tor directory,
# which contains the src directory # which contains the src directory
assert(os.path.isdir("src")) if not os.path.isdir("src"):
raise RuntimeError("Could not find './src/'. "
"Run this script from the top-level tor source "
"directory.")
# And it looks like a tor/src directory # And it looks like a tor/src directory
assert(os.path.isfile("src/include.am")) if not os.path.isfile("src/include.am"):
raise RuntimeError("Could not find './src/include.am'. "
"Run this script from the top-level tor source "
"directory.")
# Make the file name relative to the top-level tor directory # Make the file name relative to the top-level tor directory
tor_fname = tordir_file(fname) tor_fname = tordir_file(fname)
# And check that we're adding files to the "src" directory, # And check that we're adding files to the "src" directory,
# with canonical paths # with canonical paths
assert(tor_fname[:4] == "src/") if tor_fname[:4] != "src/":
raise ValueError("Requested file path '{}' canonicalized to '{}', "
"but the canonical path did not start with 'src/'. "
"Please add files to the src directory."
.format(fname, tor_fname))
c_tor_fname = makeext(tor_fname, "c") c_tor_fname = makeext(tor_fname, "c")
h_tor_fname = makeext(tor_fname, "h") h_tor_fname = makeext(tor_fname, "h")