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 66E4613888F for ; Fri, 9 Oct 2015 23:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 099BD21C00D; Fri, 9 Oct 2015 23:33:07 +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 A030021C00D for ; Fri, 9 Oct 2015 23:33:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2C73340666 for ; Fri, 9 Oct 2015 23:33:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75142DEB for ; Fri, 9 Oct 2015 23:33:03 +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: <1444433914.3a1205cfcc515ac07fa63e20c8c9988731cbc3fb.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: 3a1205cfcc515ac07fa63e20c8c9988731cbc3fb X-VCS-Branch: master Date: Fri, 9 Oct 2015 23:33:03 +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: 8d0a0276-37a0-4644-8e97-6a897d567e54 X-Archives-Hash: 9899c894154e073d6bb6899f326773fe commit: 3a1205cfcc515ac07fa63e20c8c9988731cbc3fb 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:38:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=3a1205cf grs/Interpret.py: skip non-functional build lines grs/Interpret.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/grs/Interpret.py b/grs/Interpret.py index 072574e..43c0e48 100644 --- a/grs/Interpret.py +++ b/grs/Interpret.py @@ -161,9 +161,11 @@ class Interpret(Daemon): for _line in _file.readlines(): line_number += 1 - # Skip lines with initial # as comments. - _match = re.search(r'^(#).*$', _line) - if _match: + # Do nothing for lines with initial # or blank lines. + # Create a progress stamp only if we are not doing an update run. + if re.search(r'^(#).*$', _line) or len(_line.strip()) == 0: + if not self.update_run: + stampit(progress) continue # For a release run, execute every line of the build script. @@ -198,9 +200,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)