Merge branch version/0-45-0-RC1 to adopt changes from PR #3393

ActiveState · Jul 9, 2024 · 14f084b · 14f084b
2 parents 2627b19 + 95740fa
commit 14f084b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/internal/runners/exec/exec.go b/internal/runners/exec/exec.go
@@ -119,9 +119,16 @@ func (s *Exec) Run(params *Params, args ...string) (rerr error) {
 
 	s.out.Notice(locale.Tr("operating_message", projectNamespace, projectDir))
 
-	rt, err := rtrunbit.SolveAndUpdate(s.auth, s.out, s.analytics, proj, nil, trigger, s.svcModel, s.cfg, rtrunbit.OptMinimalUI)
+	rt, commit, err := rtrunbit.Solve(s.auth, s.out, s.analytics, proj, nil, trigger, s.svcModel, s.cfg, rtrunbit.OptMinimalUI)
 	if err != nil {
-		return locale.WrapError(err, "err_activate_runtime", "Could not initialize a runtime for this project.")
+		return errs.Wrap(err, "Could not initialize runtime")
+	}
+
+	if !s.cfg.GetBool(constants.AsyncRuntimeConfig) {
+		err = rtrunbit.UpdateByReference(rt, commit, s.auth, proj, s.out, s.cfg, rtrunbit.OptMinimalUI)
+		if err != nil {
+			return errs.Wrap(err, "Could not setup runtime")
+		}
 	}
 
 	venv := virtualenvironment.New(rt)

diff --git a/internal/updater/fetcher.go b/internal/updater/fetcher.go
@@ -26,7 +26,7 @@ type Fetcher struct {
 }
 
 func NewFetcher(an analytics.Dispatcher) *Fetcher {
-	return &Fetcher{retryhttp.DefaultClient, an}
+	return &Fetcher{retryhttp.NewClient(0, retryhttp.DefaultRetries), an}
 }
 
 func (f *Fetcher) Fetch(update *UpdateInstaller, targetDir string) error {