Use globals

* continue_on_error set by omc config
* always_update_base_environment set by omc config
* Passing OMC_MSG_RESTRICT flag to msg() will print only in verbose mode

3 files changed, 15 insertions, 0 deletions

diff --git a/include/utils.h b/include/utils.h
index 0c4e308..15684e8 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -41,6 +41,8 @@ char *git_describe(const char *path);
 #define OMC_MSG_L1 1 << 3
 #define OMC_MSG_L2 1 << 4
 #define OMC_MSG_L3 1 << 5
+#define OMC_MSG_RESTRICT 1 << 6     ///< Restrict to verbose mode
+
 void msg(unsigned type, char *fmt, ...);
 void debug_shell();
 
diff --git a/src/deliverable.c b/src/deliverable.c
index cf25e25..1eb5d18 100644
--- a/src/deliverable.c
+++ b/src/deliverable.c
@@ -6,6 +6,9 @@
 #include "str.h"
 #include "strlist.h"
 #include "wheel.h"
+#include "copy.h"
+
+extern struct OMC_GLOBAL globals;
 
 #define getter(XINI, SECTION_NAME, KEY, TYPE) \
     { \
@@ -115,6 +118,11 @@ int delivery_init(struct Delivery *ctx, struct INIFILE *ini, struct INIFILE *cfg
         conv_str(ctx, storage.wheel_staging_dir);
         getter(cfg, "default", "wheel_staging_url", INIVAL_TYPE_STR);
         conv_str(ctx, storage.wheel_staging_url);
+        // Below can also be toggled by command-line arguments
+        getter(cfg, "default", "continue_on_error", INIVAL_TYPE_BOOL)
+        globals.continue_on_error = val.as_bool;
+        getter(cfg, "default", "always_update_base_environment", INIVAL_TYPE_BOOL);
+        globals.always_update_base_environment = val.as_bool;
     }
     delivery_init_dirs(ctx);
 
diff --git a/src/utils.c b/src/utils.c
index 5fe03d7..417b0cc 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -382,6 +382,11 @@ void msg(unsigned type, char *fmt, ...) {
         return;
     }
 
+    if (!globals.verbose && type & OMC_MSG_RESTRICT) {
+        // Verbose mode is not active
+        return;
+    }
+
     memset(header, 0, sizeof(header));
     memset(status, 0, sizeof(status));