From e813718a01f5b9a9bb1bbd3bd1910bbaecc89504 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 1 May 2024 08:59:49 -0400 Subject: [PATCH] Fix typo in lookup for previously-source-built PackageVersions.props (#19619) --- src/SourceBuild/content/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index 7ad555225..abda941cc 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -365,7 +365,7 @@ if [[ "$sourceOnly" == "true" ]]; then packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props" elif [ -d "$packagesArchiveDir" ]; then sourceBuiltArchive=$(find "$packagesArchiveDir" -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz') - if [ -f "${packagesPreviouslySourceBuiltDir}}PackageVersions.props" ]; then + if [ -f "${packagesPreviouslySourceBuiltDir}PackageVersions.props" ]; then packageVersionsPath=${packagesPreviouslySourceBuiltDir}PackageVersions.props elif [ -f "$sourceBuiltArchive" ]; then tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props @@ -375,8 +375,9 @@ if [[ "$sourceOnly" == "true" ]]; then if [ ! -f "$packageVersionsPath" ]; then echo "Cannot find PackagesVersions.props. Debugging info:" - echo " Attempted archive path: $packagesArchiveDir" echo " Attempted custom PVP path: $CUSTOM_PACKAGES_DIR/PackageVersions.props" + echo " Attempted previously-source-built path: ${packagesPreviouslySourceBuiltDir}PackageVersions.props" + echo " Attempted archive path: $packagesArchiveDir" exit 1 fi