@@ -91,10 +91,15 @@ func OSRelease(root string) (ver Versions, err error) {
91
91
}
92
92
93
93
func SetManifestSDKVersion (version string ) error {
94
- versionPath := filepath .Join (RepoRoot (), ".repo " , "manifests" , "version.txt" )
94
+ versionPath := filepath .Join (RepoRoot (), "src" , "scripts " , "manifests" , "version.txt" )
95
95
originalContent , err := ioutil .ReadFile (versionPath )
96
96
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
+ }
98
103
}
99
104
100
105
re := regexp .MustCompile (`FLATCAR_SDK_VERSION=.*` )
@@ -123,7 +128,11 @@ func VersionsFromDir(dir string) (ver Versions, err error) {
123
128
}
124
129
125
130
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
127
136
}
128
137
129
138
func versionsFromRemoteRepoMaybeVerify (url , branch string , verify bool ) (ver Versions , err error ) {
0 commit comments