From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D388113888F for ; Fri, 9 Oct 2015 23:06:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8A3BE07FD; Fri, 9 Oct 2015 23:06:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EE8FE07FD for ; Fri, 9 Oct 2015 23:06:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 310DC3402A2 for ; Fri, 9 Oct 2015 23:06:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE2C7DE6 for ; Fri, 9 Oct 2015 23:06:24 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1444432326.b0f3ea3a17df523436e82fb0629eeb458dcd0025.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Interpret.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b0f3ea3a17df523436e82fb0629eeb458dcd0025 X-VCS-Branch: master Date: Fri, 9 Oct 2015 23:06:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7087813c-9556-40e3-bc49-8f55771668d0 X-Archives-Hash: b0dd6a3a0e340d15adc514ce1bc452c9 commit: b0f3ea3a17df523436e82fb0629eeb458dcd0025 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Oct 9 23:12:06 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Oct 9 23:12:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=b0f3ea3a grs/Interpret.py: skip non-functional build lines grs/Interpret.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/grs/Interpret.py b/grs/Interpret.py index 072574e..744c3cc 100644 --- a/grs/Interpret.py +++ b/grs/Interpret.py @@ -161,9 +161,9 @@ class Interpret(Daemon): for _line in _file.readlines(): line_number += 1 - # Skip lines with initial # as comments. - _match = re.search(r'^(#).*$', _line) - if _match: + # Skip lines with initial # or blank lines. + if re.search(r'^(#).*$', _line) or len(_line.strip()) == 0: + stampit(progress) continue # For a release run, execute every line of the build script. @@ -198,9 +198,6 @@ class Interpret(Daemon): # build script are implemented. Note: 'hashit' can only come # after 'tarit' or 'isoit' so that it knows the medium_name # to hash, ie whether its a .tar.xz or a .iso - if verb == '': - stampit(progress) - continue if verb == 'log': if smartlog(_line, obj, True): stampit(progress)