commit f9dd42de6034ab09f9fa649ed1fbea25bc05e598
author Michael Runge <mrunge@google.com> Fri Dec 20 19:33:05 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 20 19:33:05 2013 +0000
tree b58cc822d09668b8621238c87a59b31704be145c
parent 168724c31ad5241e157ebb35135a734fa075d53b
parent 6eed2247714967eb0ce913d7da782fa884a4c1bd

Merge "Don't abort on read_file if the file is missing." into klp-dev

updater/install.c

diff --git a/updater/install.c b/updater/install.c
index 9f299f6..b6852b0 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -1353,7 +1353,6 @@
     }
 
     if (args[0]->size < 0) {
-        printf("%s(): no file contents received", name);
         return StringValue(strdup(""));
     }
     uint8_t digest[SHA_DIGEST_SIZE];
@@ -1406,12 +1405,11 @@
 
     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;