From: teor <teor@torproject.org>
Date: Mon, 20 Jan 2020 03:20:42 +0000 (+1000)
Subject: add_c_file: Replace asserts with exceptions
X-Git-Tag: tor-0.4.3.1-alpha~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28c8c63de96f82818b3ce40c027beb73519000da;p=thirdparty%2Ftor.git

add_c_file: Replace asserts with exceptions

Closes 32962.
---

diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py
index 75e1f556b8..e1e224d8d5 100755
--- a/scripts/maint/add_c_file.py
+++ b/scripts/maint/add_c_file.py
@@ -268,15 +268,26 @@ def run(fname):
 
     # Make sure we're in the top-level tor 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
-    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
     tor_fname = tordir_file(fname)
     # And check that we're adding files to the "src" directory,
     # 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")
     h_tor_fname = makeext(tor_fname, "h")