blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: fix issue in first-time setup wizard causing empty blender var

Browse Source 
Fix an issue in the First-Time Setup wizard, which caused an empty `blender`
variable when using the system-default location for Blender.

Fixes #104366
This commit is contained in:
Sybren A. Stüvel 2025-03-20 13:20:32 +01:00
parent a666b87f7f
commit 5706fe435a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ bugs in actually-released versions.
This happens uniformly, regardless of the platform. So also on Linux, which has a case-sensitive filesystem, this matching is done in a case-insensitive way. It is very unlikely that a Flamenco configuration has two separate variables, for paths that only differ in their case. This happens uniformly, regardless of the platform. So also on Linux, which has a case-sensitive filesystem, this matching is done in a case-insensitive way. It is very unlikely that a Flamenco configuration has two separate variables, for paths that only differ in their case.
- Fix issue where jobs could get stuck in `pause-requested` state. Such jobs are now also detected at startup of the Manager, and sent to `paused` when possible. - Fix issue where jobs could get stuck in `pause-requested` state. Such jobs are now also detected at startup of the Manager, and sent to `paused` when possible.
- Log a warning at startup when the `blender` variable is missing, or has no value for one or more platforms. - Log a warning at startup when the `blender` variable is missing, or has no value for one or more platforms.
- Fix an issue in the First Time Setup wizard, where the "System Default Location for Blender" could cause the `blender` variable to be empty, and thus the farm inoperable.
## 3.6 - released 2024-12-01 ## 3.6 - released 2024-12-01

2
internal/manager/api_impl/meta.go
View File

@ -291,7 +291,7 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error {
// The input command can be found on $PATH, and thus we don't need to save // The input command can be found on $PATH, and thus we don't need to save
// the absolute path to Blender here. // the absolute path to Blender here.
executable = setupAssistantCfg.BlenderExecutable.Input executable = setupAssistantCfg.BlenderExecutable.Input
case api.BlenderPathSourceInputPath: case api.BlenderPathSourceInputPath, api.BlenderPathSourceSystemLocation:
// The path should be used as-is. // The path should be used as-is.
executable = setupAssistantCfg.BlenderExecutable.Path executable = setupAssistantCfg.BlenderExecutable.Path
} }