Changeset 40967 for trunk/tools/backups/utils/subprocess_utils.py

Timestamp:

Oct 24, 2019, 2:41:04 PM (7 years ago)

Author:

fairlamb

Message:

Merge IPP-259 into trunk: Improved backup programs

Location:

trunk

Files:

• . (modified) (1 prop)
• tools (modified) (1 prop)
• tools/backups/utils/subprocess_utils.py (modified) (3 diffs)

trunk/tools/backups/utils/subprocess_utils.py

@@ -2 +2 @@
 
 # Plans are to flesh this out a bit more to make some smarter copying etc
-from backups.utils.errors import ValidationError, SubprocessError
+from .errors import ValidationError, SubprocessError
 
 
@@ -34 +34 @@
 
 
+def local_rsync_wrapper(args: [str]):
+    if args is None:
+        raise ValidationError(f"Error:no arguments provided to {local_rsync_wrapper.__name__}")
+    command_and_args = ["rsync"] + args
+    return simple_unix_wrapper(command_and_args)
+
+
 def simple_unix_wrapper(command_and_args: [str]):
     """ This should provide the program name and all arguments in a list.
@@ -42 +49 @@
 
     try:
-        subprocess.check_call(command_and_args)
+        subprocess_exitcode = subprocess.check_call(command_and_args)
     except (subprocess.CalledProcessError) as cpe:
         raise SubprocessError(f"{type(cpe)} in python simple_unix_wrapper") from cpe
     except (ValidationError) as ve:
         raise ValidationError(f"{type(ve)} in python simple_unix_wrapper") from ve
-    return 0
+    return subprocess_exitcode