commit 79c13cee260ebca72752439353fa739aa6f3230f
author Tianjie Xu <xunchang@google.com> Mon May 23 18:13:58 2016 -0700
committer Tianjie Xu <xunchang@google.com> Mon May 23 18:13:58 2016 -0700
tree 5c64036573622ef1291e24e8c0c5c036f3052484
parent 549745cc8778f806e46809e472fbcf3c7f066b83
parent 84478e88234b68e457e18877ba9542029e5c7865

resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp

Change-Id: I84ed9e14d3103e5497a6d57fde0abafe9265a148

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index dc27561..a65b32d 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -1013,7 +1013,6 @@
     }
 
     if (ota_fread(buffer, 1, st.st_size, f) != static_cast<size_t>(st.st_size)) {
-        ota_fclose(f);
         ErrorAbort(state, kFreadFailure, "%s: failed to read %zu bytes from %s",
                    name, static_cast<size_t>(st.st_size), filename);
         ota_fclose(f);