am 15f5fe1b: am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-dev

* commit '15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932':
  Don't abort on read_file if the file is missing.

1 files changed, 3 insertions, 5 deletions

diff --git a/updater/install.c b/updater/install.c
index 75bf4e1..aebd4f3 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -1271,7 +1271,6 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) {
     }
 
     if (args[0]->size < 0) {
-        printf("%s(): no file contents received", name);
         return StringValue(strdup(""));
     }
     uint8_t digest[SHA_DIGEST_SIZE];
@@ -1324,12 +1323,11 @@ Value* ReadFileFn(const char* name, State* state, int argc, Expr* argv[]) {
 
     FileContents fc;
     if (LoadFileContents(filename, &fc, RETOUCH_DONT_MASK) != 0) {
-        ErrorAbort(state, "%s() loading \"%s\" failed: %s",
-                   name, filename, strerror(errno));
         free(filename);
-        free(v);
+        v->size = -1;
+        v->data = NULL;
         free(fc.data);
-        return NULL;
+        return v;
     }
 
     v->size = fc.size;