CFU should not double projects in "Updates" and "My Updates"

Ignore files in "Updates", if identical named file is found in "My Updates" working on #203
VFPX · Dec 1, 2023 · 38bed17 · 38bed17
1 parent 798a501
commit 38bed17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Installed Files/Source/Procs_For_Thor/thor_proc_getupdatelist.prg b/Installed Files/Source/Procs_For_Thor/thor_proc_getupdatelist.prg
@@ -34,6 +34,12 @@ Procedure AddUpdateFolder (loUpdateList, tlIsThor, lcUpdateFolder, lcNeverUpdate
 			Loop
 		Endif
 
+*SF 20231201 Ignore file in Updates, if identical named file is found in My Updates; #203
+		IF tcFromMyUpdates=='No' AND File (tcUpdateFolder + 'My Updates\' + laFiles[lnI, 1]) Then
+			Loop
+		ENDIF &&tcFromMyUpdates=='No' AND File (tcUpdateFolder + 'My Updates\' + laFiles[lnI, 1])
+*SF 20231201 Ignore file in Updates, if identical named file is found in My Updates; #203
+
 		loResult	  = Execscript (_Screen.cThorDispatcher, 'Thor_Proc_GetUpdaterObject2')
 		loResult.File = lcFile
 		loResult.FromMyUpdates = tcFromMyUpdates

diff --git a/Installed Files/Thor/Tools/Procs/thor_proc_getupdatelist.prg b/Installed Files/Thor/Tools/Procs/thor_proc_getupdatelist.prg
@@ -34,6 +34,12 @@ Procedure AddUpdateFolder (loUpdateList, tlIsThor, lcUpdateFolder, lcNeverUpdate
 			Loop
 		Endif
 
+*SF 20231201 Ignore file in Updates, if identical named file is found in My Updates; #203
+		IF tcFromMyUpdates=='No' AND File (tcUpdateFolder + 'My Updates\' + laFiles[lnI, 1]) Then
+			Loop
+		ENDIF &&tcFromMyUpdates=='No' AND File (tcUpdateFolder + 'My Updates\' + laFiles[lnI, 1])
+*SF 20231201 Ignore file in Updates, if identical named file is found in My Updates; #203
+
 		loResult	  = Execscript (_Screen.cThorDispatcher, 'Thor_Proc_GetUpdaterObject2')
 		loResult.File = lcFile
 		loResult.FromMyUpdates = tcFromMyUpdates