Bugfixes for backup sections
** Still broken though
This commit is contained in:
parent
20a730c6e7
commit
541660484b
2 changed files with 5 additions and 5 deletions
|
|
@ -4,14 +4,14 @@ from functions.disk import *
|
||||||
|
|
||||||
# Regex
|
# Regex
|
||||||
REGEX_BAD_PATH_NAMES = re.compile(
|
REGEX_BAD_PATH_NAMES = re.compile(
|
||||||
r'([<>:"/\\\|\?\*]'
|
r'([<>:"/\|\?\*]'
|
||||||
r'|^(CON|PRN|AUX|NUL|COM\d*|LPT\d*)$)'
|
r'|^(CON|PRN|AUX|NUL|COM\d*|LPT\d*)$)'
|
||||||
r'|^\s+'
|
r'|^\s+'
|
||||||
r'|[\s\.]+$',
|
r'|[\s\.]+$',
|
||||||
re.IGNORECASE)
|
re.IGNORECASE)
|
||||||
|
|
||||||
def backup_partition(disk, partition):
|
def backup_partition(disk, par):
|
||||||
if par['Image Exists'] or par['Number'] in disk['Bad Partitions']:
|
if par.get('Image Exists', False) or par['Number'] in disk['Bad Partitions']:
|
||||||
raise GenericAbort
|
raise GenericAbort
|
||||||
|
|
||||||
cmd = [
|
cmd = [
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ def menu_backup():
|
||||||
mount_backup_shares()
|
mount_backup_shares()
|
||||||
|
|
||||||
# Select destination
|
# Select destination
|
||||||
destination = select_backup_destination()
|
destination = select_backup_destination(auto_select=False)
|
||||||
|
|
||||||
# Scan disks
|
# Scan disks
|
||||||
try_and_print(
|
try_and_print(
|
||||||
|
|
@ -136,7 +136,7 @@ def menu_backup():
|
||||||
function = backup_partition,
|
function = backup_partition,
|
||||||
other_results = other_results,
|
other_results = other_results,
|
||||||
disk = disk,
|
disk = disk,
|
||||||
partition = par)
|
par = par)
|
||||||
if not result['CS']:
|
if not result['CS']:
|
||||||
errors = True
|
errors = True
|
||||||
par['Error'] = result['Error']
|
par['Error'] = result['Error']
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue