commit 324cf68f265175ff3a747a5833aff6b9abd54bef
author Mike Frysinger <vapier@chromium.org> Mon Sep 22 15:52:50 2014 -0400
committer Mike Frysinger <vapier@chromium.org> Mon Sep 22 20:39:00 2014 +0000
tree 7f639ea607b45c46719398b211e05b145f237b19
parent 94a670c0e10ae66d29c11183a0dd959e7a771072

pre-upload: fix repo-name layout.conf check

The code assumed data was one large string buffer rather than an array
of lines.  Fix the check to work with an array.

BUG=chromium:386495
TEST=checked moblab overlay CL

Change-Id: I1f9cf18cc7f9319108dec561952db8ac7f843165
Reviewed-on: https://chromium-review.googlesource.com/219286
Reviewed-by: Steve Fung <stevefung@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 5393872..17ceb82 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -807,7 +807,10 @@
       errors += ['enable file checking with: use-manifests = true']
 
     # Require repo-name to be set.
-    if 'repo-name = ' not in data:
+    for line in data:
+      if line.startswith('repo-name = '):
+        break
+    else:
       errors += ['set the board name with: repo-name = $BOARD']
 
   # Summarize all the errors we saw (if any).