@@ -361,7 +361,10 @@ func ReadManifestFinal(
361
361
}
362
362
variants = append (variants , manifest .Platform )
363
363
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
+ }
365
368
fi , err := os .Stat (bl )
366
369
if err == nil {
367
370
// Local file exists, check it.
@@ -373,10 +376,6 @@ func ReadManifestFinal(
373
376
glog .V (1 ).Infof ("%s is a tombstone, skipping" , bl )
374
377
continue
375
378
}
376
- bl , err := filepath .Abs (bl )
377
- if err != nil {
378
- return nil , nil , errors .Trace (err )
379
- }
380
379
ourutil .Freportf (logWriter , "Prebuilt binary for %q already exists at %q" , lcur .Lib .Name , bl )
381
380
binaryLib = bl
382
381
break
@@ -995,15 +994,15 @@ func prepareLib(
995
994
// `lib mos.yml' name; m.Name == libRefName || library location basename.
996
995
// After validation, m.Name will be the library `name to use' above.
997
996
if libManifest .Name != "" {
998
- if libRefName != "" && libRefName != libManifest .Name { // (6, 8) above
997
+ if libRefName != "" && libRefName != libManifest .Name { // (6, 8) above
999
998
lpres <- libPrepareResult {
1000
999
err : fmt .Errorf ("Library %q at %q is referred to as %q from %q" ,
1001
1000
libManifest .Name , m .Location ,
1002
1001
libRefName , manifest .Origin ),
1003
1002
}
1004
1003
return
1005
1004
}
1006
- if libRefName == "" && m .Name != libManifest .Name { // (7) above
1005
+ if libRefName == "" && m .Name != libManifest .Name { // (7) above
1007
1006
lpres <- libPrepareResult {
1008
1007
err : fmt .Errorf ("Library %q at %q must be referred to as %q from %q" ,
1009
1008
libManifest .Name , m .Location ,
@@ -1012,7 +1011,7 @@ func prepareLib(
1012
1011
return
1013
1012
}
1014
1013
}
1015
- if libRefName != "" && m .Name != libRefName { // (3, 9) above
1014
+ if libRefName != "" && m .Name != libRefName { // (3, 9) above
1016
1015
m .Name = libRefName
1017
1016
}
1018
1017
name , err := m .GetName ()
0 commit comments