Skip to content

Commit 991be5d

Browse files
committed
Absolutize binary lib path in all cases
Otherwise causes spurious final manifest diffs
1 parent ea63b00 commit 991be5d

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

cli/manifest_parser/manifest_parser.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,10 @@ func ReadManifestFinal(
361361
}
362362
variants = append(variants, manifest.Platform)
363363
for _, variant := range variants {
364-
bl := moscommon.GetBinaryLibFilePath(buildDirAbs, lcur.Lib.Name, variant, libVersion)
364+
bl, err := filepath.Abs(moscommon.GetBinaryLibFilePath(buildDirAbs, lcur.Lib.Name, variant, libVersion))
365+
if err != nil {
366+
return nil, nil, errors.Trace(err)
367+
}
365368
fi, err := os.Stat(bl)
366369
if err == nil {
367370
// Local file exists, check it.
@@ -373,10 +376,6 @@ func ReadManifestFinal(
373376
glog.V(1).Infof("%s is a tombstone, skipping", bl)
374377
continue
375378
}
376-
bl, err := filepath.Abs(bl)
377-
if err != nil {
378-
return nil, nil, errors.Trace(err)
379-
}
380379
ourutil.Freportf(logWriter, "Prebuilt binary for %q already exists at %q", lcur.Lib.Name, bl)
381380
binaryLib = bl
382381
break
@@ -995,15 +994,15 @@ func prepareLib(
995994
// `lib mos.yml' name; m.Name == libRefName || library location basename.
996995
// After validation, m.Name will be the library `name to use' above.
997996
if libManifest.Name != "" {
998-
if libRefName != "" && libRefName != libManifest.Name { // (6, 8) above
997+
if libRefName != "" && libRefName != libManifest.Name { // (6, 8) above
999998
lpres <- libPrepareResult{
1000999
err: fmt.Errorf("Library %q at %q is referred to as %q from %q",
10011000
libManifest.Name, m.Location,
10021001
libRefName, manifest.Origin),
10031002
}
10041003
return
10051004
}
1006-
if libRefName == "" && m.Name != libManifest.Name { // (7) above
1005+
if libRefName == "" && m.Name != libManifest.Name { // (7) above
10071006
lpres <- libPrepareResult{
10081007
err: fmt.Errorf("Library %q at %q must be referred to as %q from %q",
10091008
libManifest.Name, m.Location,
@@ -1012,7 +1011,7 @@ func prepareLib(
10121011
return
10131012
}
10141013
}
1015-
if libRefName != "" && m.Name != libRefName { // (3, 9) above
1014+
if libRefName != "" && m.Name != libRefName { // (3, 9) above
10161015
m.Name = libRefName
10171016
}
10181017
name, err := m.GetName()

0 commit comments

Comments
 (0)