Skip to content

Commit 5b7b66f

Browse files
committed
sdk: Use new manifests location
1 parent 99dccdb commit 5b7b66f

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Diff for: sdk/version.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,15 @@ func OSRelease(root string) (ver Versions, err error) {
9191
}
9292

9393
func SetManifestSDKVersion(version string) error {
94-
versionPath := filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt")
94+
versionPath := filepath.Join(RepoRoot(), "src", "scripts", "manifests", "version.txt")
9595
originalContent, err := ioutil.ReadFile(versionPath)
9696
if err != nil {
97-
return err
97+
// Try old location.
98+
versionPath = filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt")
99+
originalContent, err = ioutil.ReadFile(versionPath)
100+
if err != nil {
101+
return err
102+
}
98103
}
99104

100105
re := regexp.MustCompile(`FLATCAR_SDK_VERSION=.*`)
@@ -123,7 +128,11 @@ func VersionsFromDir(dir string) (ver Versions, err error) {
123128
}
124129

125130
func VersionsFromManifest() (Versions, error) {
126-
return VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests"))
131+
versions, err := VersionsFromDir(filepath.Join(RepoRoot(), "src", "scripts", "manifests"))
132+
if err != nil {
133+
versions, err = VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests"))
134+
}
135+
return versions, err
127136
}
128137

129138
func versionsFromRemoteRepoMaybeVerify(url, branch string, verify bool) (ver Versions, err error) {

0 commit comments

Comments
 (0)