File tree Expand file tree Collapse file tree 1 file changed +22
-8
lines changed
Expand file tree Collapse file tree 1 file changed +22
-8
lines changed Original file line number Diff line number Diff line change 1818import sys
1919
2020# Set meta info
21- appVersion = '2.0.0 '
21+ appVersion = '2.0.1 '
2222threadsForProgressBar = 5
2323
2424# TODO: Add a button in @interface for deleting the @config from @selected_drives
@@ -948,11 +948,20 @@ def buildDeltaFileList(drive):
948948 # exclusion, so delete it
949949 fileList ['delete' ].append ((entry .path , get_directory_size (entry .path )))
950950 except NotADirectoryError :
951- return []
951+ return {
952+ 'delete' : [],
953+ 'replace' : []
954+ }
952955 except PermissionError :
953- return []
956+ return {
957+ 'delete' : [],
958+ 'replace' : []
959+ }
954960 except OSError :
955- return []
961+ return {
962+ 'delete' : [],
963+ 'replace' : []
964+ }
956965 return fileList
957966
958967 def buildNewFileList (drive , shares ):
@@ -996,11 +1005,17 @@ def buildNewFileList(drive, shares):
9961005 # Path doesn't exist on dest, so add to list if not excluded
9971006 fileList ['new' ].append ((targetDrive + entry .path [3 :], get_directory_size (entry .path )))
9981007 except NotADirectoryError :
999- return []
1008+ return {
1009+ 'new' : []
1010+ }
10001011 except PermissionError :
1001- return []
1012+ return {
1013+ 'new' : []
1014+ }
10021015 except OSError :
1003- return []
1016+ return {
1017+ 'new' : []
1018+ }
10041019 return fileList
10051020
10061021 # Build list of files/dirs to delete and replace
@@ -1829,7 +1844,6 @@ def runBackup():
18291844
18301845 doCopy (sourceFile , destFile , guiOptions )
18311846
1832- # URGENT: Fix this GUI output to not break with list types
18331847 if not threadManager .threadList ['Backup' ]['killFlag' ]:
18341848 cmdInfoBlocks [cmd ['displayIndex' ]]['state' ].configure (text = 'Done' , fg = color .FINISHED )
18351849 cmdInfoBlocks [cmd ['displayIndex' ]]['lastOutResult' ].configure (text = 'Done' , fg = color .FINISHED )
You can’t perform that action at this time.
0 commit comments