From patchwork Mon Nov 21 14:36:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 5235 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 784F123E03 for ; Mon, 21 Nov 2011 14:36:18 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4396DA18394 for ; Mon, 21 Nov 2011 14:36:18 +0000 (UTC) Received: by yenl9 with SMTP id l9so3419753yen.11 for ; Mon, 21 Nov 2011 06:36:17 -0800 (PST) Received: by 10.152.144.136 with SMTP id sm8mr9147889lab.33.1321886177166; Mon, 21 Nov 2011 06:36:17 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs120723lal; Mon, 21 Nov 2011 06:36:16 -0800 (PST) Received: by 10.216.221.81 with SMTP id q59mr2277024wep.82.1321886174208; Mon, 21 Nov 2011 06:36:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id j7si4724851wed.134.2011.11.21.06.36.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Nov 2011 06:36:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RSUyj-0007j3-T2 for ; Mon, 21 Nov 2011 14:36:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D1473E01E9 for ; Mon, 21 Nov 2011 14:36:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 466 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 466: Allow empty lines in Snowball startfiles config file. Message-Id: <20111121143613.26791.21301.launchpad@ackee.canonical.com> Date: Mon, 21 Nov 2011 14:36:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14299"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: de038d024fbcbaf5b9c286dc9cfa514d59ce946d Merge authors: Leonid (leonid-kudryavtsev-deactivatedaccount) Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/bug-797135-snowball-whitespace/+merge/82518 proposed by: Mattias Backman (mabac) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 466 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Mon 2011-11-21 15:34:49 +0100 message: Allow empty lines in Snowball startfiles config file. modified: linaro_image_tools/media_create/boards.py linaro_image_tools/media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-11-16 09:01:55 +0000 +++ linaro_image_tools/media_create/boards.py 2011-11-21 14:34:49 +0000 @@ -1134,6 +1134,9 @@ 'r') as info_file: for line in info_file: file_data = line.split() + if len(file_data) == 0: + # Line contains only whitespace + continue if file_data[0][0] == '#': continue if file_data[1].startswith('/'): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-11-21 13:49:14 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-11-21 14:34:49 +0000 @@ -690,6 +690,8 @@ for line in src_data: # Write comments, so we test that the parser can read them f.write('#Yet another comment\n') + # Write whitespace, so we test that the parser can handle them + f.write(' \n\t\n \t \t \n') f.write('%s %s %i %#x %s\n' % line) expected = [] # Define dummy binary files, containing nothing but their own