backups: increase readability of long function calls

core/qubesutils.py

@@ -1963,8 +1963,17 @@ def backup_restore_do(backup_dir, restore_tmpdir, passphrase, restore_info, host
         vms_dirs.append(vm.backup_path+"*")
         vms[vm.name] = vm
 
-    restore_vm_dirs (backup_dir, restore_tmpdir, passphrase, vms_dirs, vms, vms_size, print_callback, error_callback, progress_callback, encrypted, appvm)
-
+    restore_vm_dirs (backup_dir,
+            restore_tmpdir,
+            passphrase=passphrase,
+            vms_dirs=vms_dirs,
+            vms=vms,
+            vms_size=vms_size,
+            print_callback=print_callback,
+            error_callback=error_callback,
+            progress_callback=progress_callback,
+            encrypted=encrypted,
+            appvm=appvm)
 
     # Add VM in right order
     for (vm_class_name, vm_class) in sorted(QubesVmClasses.items(),

qvm-tools/qvm-backup

@@ -96,7 +96,10 @@ def main():
     passphrase = getpass.getpass("Please enter the pass phrase that will be used to encrypt/verify the backup: ")
 
     try:
-        backup_do_copy(base_backup_dir, files_to_backup, passphrase, progress_callback=print_progress, encrypt=options.encrypt,appvm=options.appvm)
+        backup_do_copy(base_backup_dir, files_to_backup, passphrase,
+                progress_callback=print_progress,
+                encrypt=options.encrypt,
+                appvm=options.appvm)
     except QubesException as e:
         print >>sys.stderr, "ERROR: %s" % str(e)
         exit(1)