commit b2364342a05a689bc302bfcd7d5d15f528eb772c
author Doug Zongker <dougz@android.com> Thu Mar 22 14:48:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 22 14:48:59 2012 -0700
tree e3f4f58e0f6b8d0195905a048a4952954326e78e
parent 19021a77ecfa464f1a62c57699f317c154f50190
parent acd73ed156e6f10b96fc277738845f833c514b77

Merge "fail edify script if set_perm() or symlink() fails"

updater/install.c

diff --git a/updater/install.c b/updater/install.c
index c087d4e..7b7bfc9 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -450,21 +450,27 @@
         return NULL;
     }
 
+    int bad = 0;
     int i;
     for (i = 0; i < argc-1; ++i) {
         if (unlink(srcs[i]) < 0) {
             if (errno != ENOENT) {
                 fprintf(stderr, "%s: failed to remove %s: %s\n",
                         name, srcs[i], strerror(errno));
+                ++bad;
             }
         }
         if (symlink(target, srcs[i]) < 0) {
             fprintf(stderr, "%s: failed to symlink %s to %s: %s\n",
                     name, srcs[i], target, strerror(errno));
+            ++bad;
         }
         free(srcs[i]);
     }
     free(srcs);
+    if (bad) {
+        return ErrorAbort(state, "%s: some symlinks failed", name);
+    }
     return StringValue(strdup(""));
 }
 
@@ -483,6 +489,7 @@
 
     char* end;
     int i;
+    int bad = 0;
 
     int uid = strtoul(args[0], &end, 0);
     if (*end != '\0' || args[0][0] == 0) {
@@ -524,10 +531,12 @@
             if (chown(args[i], uid, gid) < 0) {
                 fprintf(stderr, "%s: chown of %s to %d %d failed: %s\n",
                         name, args[i], uid, gid, strerror(errno));
+                ++bad;
             }
             if (chmod(args[i], mode) < 0) {
                 fprintf(stderr, "%s: chmod of %s to %o failed: %s\n",
                         name, args[i], mode, strerror(errno));
+                ++bad;
             }
         }
     }
@@ -539,6 +548,10 @@
     }
     free(args);
 
+    if (bad) {
+        free(result);
+        return ErrorAbort(state, "%s: some changes failed", name);
+    }
     return StringValue(result);
 }