# HG changeset patch # User BarthaM@N3SIM1218.D03.arc.local # Date 1412270980 -3600 # Node ID 8fd7b197735ce76d2379f6ba782a1a9b2cea9d60 # Parent 216da9017f8f91bd281c8db95db51a7d477bcf00 added critical session around backupSettings func diff -r 216da9017f8f -r 8fd7b197735c OpenSecurity/bin/vmmanager.pyw --- a/OpenSecurity/bin/vmmanager.pyw Thu Oct 02 13:08:09 2014 +0100 +++ b/OpenSecurity/bin/vmmanager.pyw Thu Oct 02 18:29:40 2014 +0100 @@ -61,6 +61,7 @@ new_sdvm_lock = threading.Lock() +backup_lock = threading.Lock() class VMManagerException(Exception): def __init__(self, value): @@ -1051,9 +1052,11 @@ self.vmm.sdvmFactory.trigger() def backupFile(self, src, dest): - certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key' - command = '-r -o StrictHostKeyChecking=no -i "' + certificate + '" "osecuser@' + self.ip_addr + ':' + src + '" "' + dest + '"' - return Cygwin.execute(Cygwin.cygwin_scp, command, wait_return=True, window=False) + global backup_lock + with backup_lock: + certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key' + command = '-r -o StrictHostKeyChecking=no -i "' + certificate + '" "osecuser@' + self.ip_addr + ':' + src + '" "' + dest + '"' + return Cygwin.execute(Cygwin.cygwin_scp, command, wait_return=True, window=False) def restoreFile(self, src, dest): certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key'