Merge "github-mirror should fetch+reset, not pull."
diff --git a/jiri-profile-v23/go_profile/go.go b/jiri-profile-v23/go_profile/go.go
index bed4eb2..b7af619 100644
--- a/jiri-profile-v23/go_profile/go.go
+++ b/jiri-profile-v23/go_profile/go.go
@@ -336,7 +336,7 @@
}
defer jirix.NewSeq().RemoveAll(tmpDir)
- name := "go1.4.2.src.tar.gz"
+ name := "go1.4.3.src.tar.gz"
remote, local := "https://storage.googleapis.com/golang/"+name, filepath.Join(tmpDir, name)
parentDir := filepath.Dir(go14Dir)
goSrcDir := filepath.Join(go14Dir, "src")
diff --git a/vbinary/cmd.go b/vbinary/cmd.go
index fa7663f..57e496a 100644
--- a/vbinary/cmd.go
+++ b/vbinary/cmd.go
@@ -41,6 +41,9 @@
maxParallelDownloads int
waitTimeBetweenAttempts = 3 * time.Minute
+
+ createClientAttempts = 5
+ waitTimeBetweenCreateClientAttempts = 1 * time.Minute
)
const (
@@ -333,7 +336,7 @@
}
return nil
}
- if err := retry.Function(ctx, createDefaultClientFn); err != nil {
+ if err := retry.Function(ctx, createDefaultClientFn, retry.AttemptsOpt(createClientAttempts), retry.IntervalOpt(waitTimeBetweenAttempts)); err != nil {
return nil, fmt.Errorf("failed to create default client")
}
return defaultClient, nil
