Merge pull request #2106 from vladak/projadm_base

emit errors along with guidance how to fix them

Author: tarzanek

tools/sync/projadm.py

@@ -237,7 +237,9 @@ def project_delete(doit, logger, project, messages):
             logger.debug("Using {} as instance base".
                          format(args.base))
         else:
-            logger.error("Not a directory: {}".format(args.base))
+            logger.error("Not a directory: {}\n"
+                         "Set the base directory with the --base option."
+                         .format(args.base))
             sys.exit(1)
 
     # read-only configuration file.
@@ -250,7 +252,15 @@ def project_delete(doit, logger, project, messages):
 
     # XXX replace Messages with REST request after issue #1801
     messages_file = get_command(logger, args.messages, "Messages")
+    if not messages_file:
+        logger.error("Use the --messages option to specify the path to"
+                     "the Messages script")
+        sys.exit(1)
     configmerge_file = get_command(logger, args.configmerge, "ConfigMerge")
+    if not configmerge_file:
+        logger.error("Use the --configmerge option to specify the path to"
+                     "the ConfigMerge script")
+        sys.exit(1)
 
     lock = filelock.FileLock(os.path.join(tempfile.gettempdir(),
                              os.path.basename(sys.argv[0]) + ".lock"))

tools/sync/utils.py

@@ -58,7 +58,7 @@ def get_command(logger, path, name):
         if not is_exe(cmd_file):
             logger.error("file {} is not executable file".
                          format(path))
-            sys.exit(1)
+            return None
     else:
         cmd_file = which(name)
         if not cmd_file:
@@ -68,7 +68,7 @@ def get_command(logger, path, name):
             if not cmd_file:
                 logger.error("cannot determine path to the {} script".
                              format(name))
-                sys.exit(1)
+                return None
     logger.debug("{} = {}".format(name, cmd_file))
 
     return cmd_file