commit 15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932
author Michael Runge <mrunge@google.com> Thu Dec 26 15:33:28 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 26 15:33:28 2013 -0800
tree 6fde5ea05804ee8b672c3a874279dd1e3ef587cc
parent e1bb2733f9261336f38a94dc9d93ed010a7cbc57
parent f9dd42de6034ab09f9fa649ed1fbea25bc05e598

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

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

updater/install.c

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 @@
     }
 
     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 @@
 
     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;