Merge pull request #54 from ghrcdaac/mlh0079-5311-dmrpp-option-issue

 - Resolved issue with local file being used for -u option.

dmrpp_generator/generate_and_validate_dmrpp.py

@@ -42,7 +42,7 @@ def generate_docker_compose():
     # Path to dockerfile.
     # '.' represents the current directory in which
     # docker-compose.yml is present.
-    image: ghrcdaac/dmrpp-generator:v3.4.0
+    image: ghrcdaac/dmrpp-generator:v4.1.1
     environment:
       - PAYLOAD=${PAYLOAD}
     # Mount volume

dmrpp_generator/main.py

@@ -147,7 +147,7 @@ def get_dmrpp_command(self, dmrpp_meta, input_path, output_filename, local=False
         dmrpp_meta = dmrpp_meta if isinstance(dmrpp_meta, dict) else {}
         dmrpp_options = DMRppOptions(self.path)
         options = dmrpp_options.get_dmrpp_option(dmrpp_meta=dmrpp_meta)
-        local_option = f"-u file://{output_filename}" if local else ""
+        local_option = f"-u file://{output_filename}" if '-u' in options else ''
         dmrpp_cmd = f"get_dmrpp {options} {input_path} -o {output_filename}.dmrpp" \
                     f" {local_option} {os.path.basename(output_filename)}"
         return " ".join(dmrpp_cmd.split())
@@ -174,7 +174,11 @@ def run_command(self, cmd):
             stdout = subprocess.PIPE
             stderr = subprocess.STDOUT
 
-        out = subprocess.run(cmd.split(), stdout=stdout, stderr=stderr, timeout=self.timeout, check=True)
+        try:
+            out = subprocess.run(cmd.split(), stdout=stdout, stderr=stderr, timeout=self.timeout, check=True)
+        except Exception as e:
+            self.logger_to_cw.info(f'cmd: {cmd}')
+            raise Exception(f'get_dmrpp failed. \ncmd: {cmd} \nException: {e}')
 
         return out