From 5f523f81426ec0e88177c05a5dbe4acb3508954a Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Fri, 26 Mar 2021 21:30:50 -0700
Subject: [PATCH] More bugfixes

---
 Makefile          | 2 +-
 tools/depgraph.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e0cf23e..254ef11 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ ifeq ($(I),lang)
 	node tools/build-lang-image.js --lang $(L)
 else ifeq ($(I),ubuntu)
 	docker pull ubuntu:rolling
-	hash="$$(docker inspect ubuntu:rolling | jq '.[0].Id' -r | sha1sum | awk '{ print $1 }')"; echo "FROM ubuntu:rolling" | docker build --label riju.image-hash="$${hash}" -t riju:$(I) -
+	hash="$$(docker inspect ubuntu:rolling | jq '.[0].Id' -r | sha1sum | awk '{ print $$1 }')"; echo "FROM ubuntu:rolling" | docker build --label riju.image-hash="$${hash}" -t riju:$(I) -
 else ifneq (,$(filter $(I),admin ci))
 	docker build . -f docker/$(I)/Dockerfile -t riju:$(I) $(NO_CACHE)
 else
diff --git a/tools/depgraph.js b/tools/depgraph.js
index 6adc92e..a24f9fc 100644
--- a/tools/depgraph.js
+++ b/tools/depgraph.js
@@ -197,7 +197,7 @@ async function getLanguageTestArtifact({ lang }) {
       }
     },
     getPublishedHash: async ({ s3TestHashes }) => {
-      return s3TestHashes[lang];
+      return s3TestHashes[lang] || null;
     },
     getDesiredHash: async (dependencyHashes) => {
       return await getTestHash(lang, dependencyHashes["image:runtime"]);
@@ -356,7 +356,7 @@ async function executeDepGraph({
       }
       const promiseSets = [promises.published, promises.local];
       if (holdManual) {
-        sets.reverse();
+        promiseSets.reverse();
       }
       for (const promiseSet of promiseSets) {
         const hash = await promiseSet[target];