Changeset 40897 for branches/ipp-132_automate_jira_conf_backups/utils/python/generic_utils.py

Timestamp:

Oct 3, 2019, 11:51:21 AM (7 years ago)

Author:

fairlamb

Message:

Better errors, chmod wrapper, fixed config loading and tests

File:

• branches/ipp-132_automate_jira_conf_backups/utils/python/generic_utils.py (modified) (3 diffs)

branches/ipp-132_automate_jira_conf_backups/utils/python/generic_utils.py

@@ -16 +16 @@
 
     if source_file is None or destination_path is None:
-        print("Error: source for copy cannot be None type")
-        raise ValidationError
+        raise ValidationError("Error: source for copy cannot be None type")
     if destination_path is None:
-        print("Error: copy destination cannot be None type")
-        raise ValidationError
+        raise ValidationError("Error: copy destination cannot be None type")
     if not path.exists(source_file):
-        print("Error: Copy Failure: source does not exist: ", source_file)
-        raise ValidationError
+        raise ValidationError(f"Error: Copy Failure: source does not exist: {source_file}")
     if not path.exists(destination_path) or not path.isdir(destination_path):
         print("Error: Copy Failure: destination path does not exist: ", destination_path)
-        raise ValidationError
+        raise ValidationError(f"Error: Copy Failure: destination path does not exist: {destination_path}")
 
     try:
         if verbose:
-            print("Copying: {0} to {1}".format(source_file, destination_path))
+            print(f"Copying: {source_file} to {destination_path}")
         if path.isdir(source_file):
             copy_tree(source_file, destination_path)
@@ -36 +33 @@
             shutil.copy2(source_file, destination_path)
     except IOError as e:
-        print("Error: copy failure.\n  copying: {0}\n  to: {1}".format(e.filename, e.filename2))
-        print(e)
-        raise IOError
+        msg = f"Error: copy failure.\n  copying: {source_file}\n  to: {destination_path}"
+        raise IOError(msg) from e
     return 0
 
@@ -48 +44 @@
 
     if source_paths is None:
-        print("Error: source for copy cannot be None type")
-        raise ValidationError
+        raise ValidationError("Error: source for copy cannot be None type")
     if destination_paths is None:
-        print("Error: copy destination cannot be None type")
-        raise ValidationError
+        raise ValidationError("Error: copy destination cannot be None type")
 
     if type(source_paths) is not list or len(source_paths) == 0:
-        print("Error: sources must be given as a list with at least one entry")
-        raise ValidationError
+        raise ValidationError("Error: sources must be given as a list with at least one entry")
     if type(destination_paths) is not list or len(destination_paths) == 0:
-        print("Error: destinations must be given as a list with at least one entry")
-        raise ValidationError
+        raise ValidationError("Error: destinations must be given as a list with at least one entry")
 
     for dpath in destination_paths:
         if not path.exists(dpath):
-            print("Copy Warning: target path does not exist (skipping): ", dpath)
+            if verbose:
+                print("Copy Warning: target path does not exist (skipping): ", dpath)
             continue
         if not path.isdir(dpath):
-            print("Copy Warning: target path is not a directory (skipping): ", )
+            if verbose:
+                print("Copy Warning: target path is not a directory (skipping): ", )
             continue