Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
c6432c1350
|
|||
fa1d8f410e
|
@ -162,16 +162,6 @@ class Backup:
|
|||||||
self.create_backup_dir()
|
self.create_backup_dir()
|
||||||
self.find_last_backup()
|
self.find_last_backup()
|
||||||
|
|
||||||
if os.path.islink(f'{self.output}/simple_backup/last_backup'):
|
|
||||||
try:
|
|
||||||
os.remove(f'{self.output}/simple_backup/last_backup')
|
|
||||||
except FileNotFoundError:
|
|
||||||
logger.error('Failed to remove last_backup link. File not found')
|
|
||||||
self._err_flag = True
|
|
||||||
except PermissionError:
|
|
||||||
logger.error('Failed to remove last_backup link. Permission denied')
|
|
||||||
self._err_flag = True
|
|
||||||
|
|
||||||
_, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
|
_, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
|
||||||
_, self._exclude_path = mkstemp(prefix='tmp_exclude', text=True)
|
_, self._exclude_path = mkstemp(prefix='tmp_exclude', text=True)
|
||||||
|
|
||||||
@ -202,11 +192,24 @@ class Backup:
|
|||||||
p = Popen(rsync, stdout=PIPE, stderr=STDOUT, shell=True)
|
p = Popen(rsync, stdout=PIPE, stderr=STDOUT, shell=True)
|
||||||
output, _ = p.communicate()
|
output, _ = p.communicate()
|
||||||
|
|
||||||
|
if p.returncode != 0:
|
||||||
|
self._err_flag = True
|
||||||
|
|
||||||
output = output.decode("utf-8").split('\n')
|
output = output.decode("utf-8").split('\n')
|
||||||
|
|
||||||
logger.info(f'rsync: {output[-3]}')
|
logger.info(f'rsync: {output[-3]}')
|
||||||
logger.info(f'rsync: {output[-2]}')
|
logger.info(f'rsync: {output[-2]}')
|
||||||
|
|
||||||
|
if os.path.islink(f'{self.output}/simple_backup/last_backup'):
|
||||||
|
try:
|
||||||
|
os.remove(f'{self.output}/simple_backup/last_backup')
|
||||||
|
except FileNotFoundError:
|
||||||
|
logger.error('Failed to remove last_backup link. File not found')
|
||||||
|
self._err_flag = True
|
||||||
|
except PermissionError:
|
||||||
|
logger.error('Failed to remove last_backup link. Permission denied')
|
||||||
|
self._err_flag = True
|
||||||
|
|
||||||
try:
|
try:
|
||||||
os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup', target_is_directory=True)
|
os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup', target_is_directory=True)
|
||||||
except FileExistsError:
|
except FileExistsError:
|
||||||
|
Reference in New Issue
Block a user