From 9bd99c027df9acfcadb64ff12619b77a6255efc4 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Fri, 26 Mar 2021 21:14:19 -0700
Subject: [PATCH] Misc bugfixes

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

diff --git a/Makefile b/Makefile
index 51c3d5f..e0cf23e 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
-	docker tag ubuntu:rolling riju:ubuntu
+	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 0e35bea..6adc92e 100644
--- a/tools/depgraph.js
+++ b/tools/depgraph.js
@@ -38,7 +38,7 @@ function getInformationalDependencies() {
               `aws s3api list-objects-v2 --bucket riju-debs --prefix hashes`,
               { getStdout: true }
             )
-          ).stdout
+          ).stdout || '{"Contents": []}'
         ).Contents.map(({ Key: key }) => {
           const [_, remoteName, remoteHash] = key.split("/");
           return [remoteName, remoteHash];
@@ -53,7 +53,7 @@ function getInformationalDependencies() {
               `aws s3api list-objects-v2 --bucket riju-debs --prefix test-hashes/lang`,
               { getStdout: true }
             )
-          ).stdout
+          ).stdout || '{"Contents": []}'
         ).Contents.map(({ Key: key }) => {
           const [_1, _2, remoteName, remoteHash] = key.split("/");
           return [remoteName, remoteHash];
@@ -355,7 +355,7 @@ async function executeDepGraph({
         return hash;
       }
       const promiseSets = [promises.published, promises.local];
-      if (holdLocal) {
+      if (holdManual) {
         sets.reverse();
       }
       for (const promiseSet of promiseSets) {