aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-05-17 05:27:22 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2017-05-17 19:43:23 -0400
commit34e4d32ac75fa757373bfb60fa22233ab1f38ef6 (patch)
treeae8bc7991a3b4c7a1cbd5473bdfabaee1f3ec8b0
parent4abe9a9d781f6ff8df51864189cf7ea8c46a1406 (diff)
downloadmeson-34e4d32ac75fa757373bfb60fa22233ab1f38ef6.zip
meson-34e4d32ac75fa757373bfb60fa22233ab1f38ef6.tar.gz
meson-34e4d32ac75fa757373bfb60fa22233ab1f38ef6.tar.bz2
Remove dead code paths.
-rw-r--r--mesonbuild/interpreter.py1
-rw-r--r--mesonbuild/scripts/dist.py3
2 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 3beb8b0..c782265 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1353,7 +1353,6 @@ class Interpreter(InterpreterBase):
def module_method_callback(self, return_object):
if not isinstance(return_object, ModuleReturnValue):
- assert False
raise InterpreterException('Bug in module, it returned an invalid object')
invalues = return_object.new_objects
self.process_new_values(invalues)
diff --git a/mesonbuild/scripts/dist.py b/mesonbuild/scripts/dist.py
index 4184a5b..5ec7ca3 100644
--- a/mesonbuild/scripts/dist.py
+++ b/mesonbuild/scripts/dist.py
@@ -140,8 +140,7 @@ def run(args):
error_count = 0
for name in names:
rc = check_dist(name, meson_command) # Check only one.
- rc = 0
if rc == 0:
create_hash(name)
error_count += rc
- return rc
+ return 1 if error_count else 0