Merge commit 'upstream/3.3.0'

[debian/amanda] / client-src / selfcheck.c

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index a68f39e4f47a455a4575f03bbd906a2c2c111ddb..5234f0f993cb4719d23bbf626602197ca88e43aa 100644 (file)
--- a/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@ -313,6 +313,9 @@ main(
            err_extra = errmsg;
            goto err;
        }
+       if (merge_dles_properties(dles, 1) == 0) {
+           goto checkoverall;
+       }
        for (dle = dles; dle != NULL; dle = dle->next) {
            run_client_scripts(EXECUTE_ON_PRE_HOST_AMCHECK, g_options, dle,
                               stdout);
@@ -335,6 +338,7 @@ main(
        }
     }
 
+checkoverall:
     check_overall();
 
     amfree(line);