Merge branch 'testing'

files/scriptherder/scriptherder.py

@@ -384,7 +384,6 @@ def save_to_file(self, datadir: str, logger: logging.Logger, filename: Optional[
         f.close()
         os.rename(fn + ".tmp", fn + ".json")
         self._data["filename"] = fn
-        os.umask(old_umask)
 
         if self._output is not None:
             assert self.output_filename is not None
@@ -395,6 +394,10 @@ def save_to_file(self, datadir: str, logger: logging.Logger, filename: Optional[
             os.rename(output_fn + ".tmp", output_fn)
             self._output = None
 
+        # Restore the umask after all
+        # file operations are done.
+        os.umask(old_umask)
+
     def check(self, check: "Check", logger: logging.Logger) -> None:
         """
         Figure out status of this job, based on it's check criteria.
@@ -1383,6 +1386,8 @@ def main(myname: str, args: Arguments, logger: Optional[logging.Logger] = None)
         progname = os.path.basename(sys.argv[0])
         args = parse_args(_defaults)
         res = main(progname, args=args)
+        if isinstance(res, bool):
+            sys.exit(int(not res))
         if isinstance(res, int):
             sys.exit(res)
         if res: