From 5b7b66faa709aab3f443c635d8a911cebeb565e5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 25 Oct 2023 11:51:31 +0200 Subject: [PATCH] sdk: Use new manifests location --- sdk/version.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sdk/version.go b/sdk/version.go index f3face86d..902df7066 100644 --- a/sdk/version.go +++ b/sdk/version.go @@ -91,10 +91,15 @@ func OSRelease(root string) (ver Versions, err error) { } func SetManifestSDKVersion(version string) error { - versionPath := filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt") + versionPath := filepath.Join(RepoRoot(), "src", "scripts", "manifests", "version.txt") originalContent, err := ioutil.ReadFile(versionPath) if err != nil { - return err + // Try old location. + versionPath = filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt") + originalContent, err = ioutil.ReadFile(versionPath) + if err != nil { + return err + } } re := regexp.MustCompile(`FLATCAR_SDK_VERSION=.*`) @@ -123,7 +128,11 @@ func VersionsFromDir(dir string) (ver Versions, err error) { } func VersionsFromManifest() (Versions, error) { - return VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests")) + versions, err := VersionsFromDir(filepath.Join(RepoRoot(), "src", "scripts", "manifests")) + if err != nil { + versions, err = VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests")) + } + return versions, err } func versionsFromRemoteRepoMaybeVerify(url, branch string, verify bool) (ver Versions, err error) {