Bug 1493688 - make redirecting app data folders a non-critical error

taskcluster · Jan 21, 2019 · 9c4462a · 9c4462a
1 parent c1148f2
commit 9c4462a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/plat_windows.go b/plat_windows.go
@@ -696,12 +696,20 @@ func (task *TaskRun) removeUserFromGroups(groups []string) (updatedGroups []stri
 	return
 }
 
-func RedirectAppData(hUser syscall.Token, folder string) (err error) {
-	err = win32.SetAndCreateFolder(hUser, &win32.FOLDERID_RoamingAppData, filepath.Join(folder, "Roaming"))
+func RedirectAppData(hUser syscall.Token, folder string) error {
+	RoamingAppDataFolder := filepath.Join(folder, "Roaming")
+	LocalAppDataFolder := filepath.Join(folder, "Local")
+	err := win32.SetAndCreateFolder(hUser, &win32.FOLDERID_RoamingAppData, RoamingAppDataFolder)
 	if err != nil {
-		return
+		log.Printf("%v", err)
+		log.Printf("WARNING: Not able to redirect Roaming App Data folder to %v - IGNORING!", RoamingAppDataFolder)
+	}
+	err = win32.SetAndCreateFolder(hUser, &win32.FOLDERID_LocalAppData, LocalAppDataFolder)
+	if err != nil {
+		log.Printf("%v", err)
+		log.Printf("WARNING: Not able to redirect Local App Data folder to %v - IGNORING!", LocalAppDataFolder)
 	}
-	return win32.SetAndCreateFolder(hUser, &win32.FOLDERID_LocalAppData, filepath.Join(folder, "Local"))
+	return nil
 }
 
 func defaultTasksDir() string {

diff --git a/win32/win32_windows.go b/win32/win32_windows.go
@@ -352,6 +352,7 @@ func SetFolder(hUser syscall.Token, folder *syscall.GUID, value string) (err err
 }
 
 func SetAndCreateFolder(hUser syscall.Token, folder *syscall.GUID, value string) (err error) {
+	log.Printf("Creating folder %v", value)
 	err = SetFolder(hUser, folder, value)
 	if err != nil {
 		return