Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-8.10.x' into candidate…
Browse files Browse the repository at this point in the history
…-8.12.x

Signed-off-by: Gordon Smith <[email protected]>

# Conflicts:
#	helm/hpcc/Chart.yaml
#	helm/hpcc/templates/_helpers.tpl
#	helm/hpcc/templates/dafilesrv.yaml
#	helm/hpcc/templates/dali.yaml
#	helm/hpcc/templates/dfuserver.yaml
#	helm/hpcc/templates/eclagent.yaml
#	helm/hpcc/templates/eclccserver.yaml
#	helm/hpcc/templates/eclscheduler.yaml
#	helm/hpcc/templates/esp.yaml
#	helm/hpcc/templates/localroxie.yaml
#	helm/hpcc/templates/roxie.yaml
#	helm/hpcc/templates/sasha.yaml
#	helm/hpcc/templates/thor.yaml
#	version.cmake
  • Loading branch information
GordonSmith committed Sep 22, 2023
2 parents 139fa7b + 4848a04 commit 963c164
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ecl/eclccserver/eclccserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,9 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
}
else
{
getHomeFolder(repoRootPath);
char dir[_MAX_PATH];
if (GetCurrentDirectory(sizeof(dir), dir))
repoRootPath.append(dir);
}
if (repoRootPath.length())
{
Expand Down

0 comments on commit 963c164

Please sign in to comment.