round-robin.sh: Fix get_current_manifest, get_baseline_manifest

Change-Id: Iceec687a89bc6283d1ad114d667108cd87d38e28

1 files changed, 7 insertions, 3 deletions

diff --git a/round-robin.sh b/round-robin.sh
index 4e00d39b..18c80c34 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -918,8 +918,11 @@ get_baseline_manifest ()
     set -euf -o pipefail
     unset rr
     declare -A rr
-    source base-artifacts/manifest.sh
-    eval echo "\$$1"
+    # Emtpy result if no manifest found (udpate_baseline=init for instance)
+    if [ -f base-artifacts/manifest.sh ]; then
+        source base-artifacts/manifest.sh
+        eval echo "\$$1"
+    fi
     )
 }
 
@@ -929,9 +932,10 @@ get_current_manifest ()
 {
     (
     set -euf -o pipefail
+    local top_artifacts=${rr[top_artifacts]}
     unset rr
     declare -A rr
-    source ${rr[top_artifacts]}/manifest.sh
+    source $top_artifacts/manifest.sh
     eval echo "\$$1"
     )
 }