From 3f6eb86390e27707d1204e60e33b6a41e88f0dc8 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Mon, 23 May 2016 14:58:53 -0700
Subject: resolve merge conflicts of 50f6417

Fix a typo for ota_fclose().

Change-Id: Ia93e911aa5391afc604874fc3a09c5a45c094c80
---
 updater/install.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/updater/install.cpp b/updater/install.cpp
index dc2756141..a65b32d81 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -1013,7 +1013,6 @@ Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
     }
 
     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);
-- 
cgit v1.2.3