summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2014-04-26 03:47:18 +0200
committerMichael Runge <mrunge@google.com>2014-05-02 03:37:40 +0200
commitaa1a31e83d25e6c3c3371063704eeb14558a595e (patch)
treeb31b47fcbabac444af5651012e2aa064b0d3f97b
parentam ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD (diff)
downloadandroid_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar.gz
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar.bz2
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar.lz
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar.xz
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.tar.zst
android_bootable_recovery-aa1a31e83d25e6c3c3371063704eeb14558a595e.zip
Diffstat (limited to '')
-rw-r--r--updater/install.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/updater/install.c b/updater/install.c
index 53f5e48cb..8defc7720 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -927,8 +927,8 @@ Value* GetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
// file_getprop(file, key)
//
// interprets 'file' as a getprop-style file (key=value pairs, one
-// per line, # comment lines and blank lines okay), and returns the value
-// for 'key' (or "" if it isn't defined).
+// per line. # comment lines,blank lines, lines without '=' ignored),
+// and returns the value for 'key' (or "" if it isn't defined).
Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
char* result = NULL;
char* buffer = NULL;
@@ -986,9 +986,7 @@ Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
char* equal = strchr(line, '=');
if (equal == NULL) {
- ErrorAbort(state, "%s: malformed line \"%s\": %s not a prop file?",
- name, line, filename);
- goto done;
+ continue;
}
// trim whitespace between key and '='