build: the exceptions here are not useful

[samba.git] / buildtools / wafsamba / samba_deps.py

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index be77d2c611f1f4eed38c2d90ef117443f9d9f612..452120d657f72c6f16b0d8b4cd4016c880bf61f7 100644 (file)
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -18,7 +18,7 @@ def TARGET_ALIAS(bld, target, alias):
     cache = LOCAL_CACHE(bld, 'TARGET_ALIAS')
     if alias in cache:
         print("Target alias %s already set to %s : newalias %s" % (alias, cache[alias], target))
-        raise
+        sys.exit(1)
     cache[alias] = target
 Build.BuildContext.TARGET_ALIAS = TARGET_ALIAS
 
@@ -240,7 +240,7 @@ def check_duplicate_sources(bld, tgt_list):
 
     for t in tgt_list:
         obj_sources = getattr(t, 'source', '')
-        tpath = os_path_relpath(t.path.abspath(bld.env), t.env['BUILD_DIRECTORY'] + '/default')
+        tpath = os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default')
         obj_sources = bld.SUBDIR(tpath, obj_sources)
         t.samba_source_set = set(TO_LIST(obj_sources))
 
@@ -329,7 +329,7 @@ def build_direct_deps(bld, tgt_list):
             if d == t.sname: continue
             if not d in targets:
                 print("Unknown dependency %s in %s" % (d, t.sname))
-                raise
+                sys.exit(1)
             if targets[d] in [ 'EMPTY', 'DISABLED' ]:
                 continue
             if targets[d] == 'SYSLIB':
@@ -823,7 +823,7 @@ def check_project_rules(bld):
         t = bld.name_to_obj(tgt, bld.env)
         if t is None:
             print("Target %s of type %s has no task generator" % (tgt, type))
-            raise
+            sys.exit(1)
         tgt_list.append(t)
 
     add_samba_attributes(bld, tgt_list)