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 72D171381F3 for ; Wed, 10 Jul 2013 16:17:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 422F5E0A63; Wed, 10 Jul 2013 16:16:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6D55E0A63 for ; Wed, 10 Jul 2013 16:16:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB0D133E5FC for ; Wed, 10 Jul 2013 16:16:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DD8D7E545D for ; Wed, 10 Jul 2013 16:16:54 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373466067.44570dcbf68669e76398d31eda2b098e41f6c35c.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/simpledeprule/, roverlay/util/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/depres/simpledeprule/rulemaker.py roverlay/util/mapreader.py X-VCS-Directories: roverlay/depres/simpledeprule/ roverlay/util/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 44570dcbf68669e76398d31eda2b098e41f6c35c X-VCS-Branch: master Date: Wed, 10 Jul 2013 16:16:54 +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: 0a75c616-3f9c-4e5e-8c7c-614ae19697d8 X-Archives-Hash: f9fe6665af1a8dd3746d315bc86cba86 commit: 44570dcbf68669e76398d31eda2b098e41f6c35c Author: André Erdmann mailerd de> AuthorDate: Wed Jul 10 14:21:07 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Jul 10 14:21:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=44570dcb roverlay/depres, rule maker: reset deptype --- roverlay/depres/simpledeprule/rulemaker.py | 6 ++++++ roverlay/util/mapreader.py | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/roverlay/depres/simpledeprule/rulemaker.py b/roverlay/depres/simpledeprule/rulemaker.py index 3f9ab73..d759b56 100644 --- a/roverlay/depres/simpledeprule/rulemaker.py +++ b/roverlay/depres/simpledeprule/rulemaker.py @@ -49,6 +49,12 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ): self._deptype_once = deptype.NONE # --- end of __init__ (...) --- + def read_lines_begin ( self ): + # reset deptype + self._deptype = deptype.ALL + self._deptype_once = deptype.NONE + # --- end of read_lines_begin (...) --- + def make_result ( self, as_pool=False ): rule_count = len ( self._items ) if as_pool: diff --git a/roverlay/util/mapreader.py b/roverlay/util/mapreader.py index 2958616..c2cce1f 100644 --- a/roverlay/util/mapreader.py +++ b/roverlay/util/mapreader.py @@ -118,7 +118,16 @@ class MapFileParser ( object ): ) # --- end of add (...) --- + def read_lines_done ( self ): + pass + # --- end of read_lines_done (...) --- + + def read_lines_begin ( self ): + pass + # --- end of read_lines_begin (...) --- + def read_lines ( self, lines ): + self.read_lines_begin() self.stop_reading = False ret = True for lino, line in enumerate ( lines ): @@ -130,6 +139,9 @@ class MapFileParser ( object ): if self.stop_reading: break + + self.read_lines_done() + return ret # --- end of read_lines (...) --- def read_file ( self, filepath, handle_compressed=True ): 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 00CFB1381F3 for ; Wed, 10 Jul 2013 15:11:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69725E0A99; Wed, 10 Jul 2013 15:10:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBF46E0A97 for ; Wed, 10 Jul 2013 15:10:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5CC433E8ED for ; Wed, 10 Jul 2013 15:10:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 87683E5472 for ; Wed, 10 Jul 2013 15:10:42 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373466067.44570dcbf68669e76398d31eda2b098e41f6c35c.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/depres/simpledeprule/, roverlay/util/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/depres/simpledeprule/rulemaker.py roverlay/util/mapreader.py X-VCS-Directories: roverlay/depres/simpledeprule/ roverlay/util/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 44570dcbf68669e76398d31eda2b098e41f6c35c X-VCS-Branch: gsoc13/next Date: Wed, 10 Jul 2013 15:10:42 +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: e3dec5f4-fc81-43ec-9ee7-0ffa416dbb65 X-Archives-Hash: e7e6c9318eff911c12398b6698c99a2c Message-ID: <20130710151042.21gL-bMlOayoUriDFrOIeYY-H1CiB25cpp6VvFYfWQM@z> commit: 44570dcbf68669e76398d31eda2b098e41f6c35c Author: André Erdmann mailerd de> AuthorDate: Wed Jul 10 14:21:07 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Jul 10 14:21:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=44570dcb roverlay/depres, rule maker: reset deptype --- roverlay/depres/simpledeprule/rulemaker.py | 6 ++++++ roverlay/util/mapreader.py | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/roverlay/depres/simpledeprule/rulemaker.py b/roverlay/depres/simpledeprule/rulemaker.py index 3f9ab73..d759b56 100644 --- a/roverlay/depres/simpledeprule/rulemaker.py +++ b/roverlay/depres/simpledeprule/rulemaker.py @@ -49,6 +49,12 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ): self._deptype_once = deptype.NONE # --- end of __init__ (...) --- + def read_lines_begin ( self ): + # reset deptype + self._deptype = deptype.ALL + self._deptype_once = deptype.NONE + # --- end of read_lines_begin (...) --- + def make_result ( self, as_pool=False ): rule_count = len ( self._items ) if as_pool: diff --git a/roverlay/util/mapreader.py b/roverlay/util/mapreader.py index 2958616..c2cce1f 100644 --- a/roverlay/util/mapreader.py +++ b/roverlay/util/mapreader.py @@ -118,7 +118,16 @@ class MapFileParser ( object ): ) # --- end of add (...) --- + def read_lines_done ( self ): + pass + # --- end of read_lines_done (...) --- + + def read_lines_begin ( self ): + pass + # --- end of read_lines_begin (...) --- + def read_lines ( self, lines ): + self.read_lines_begin() self.stop_reading = False ret = True for lino, line in enumerate ( lines ): @@ -130,6 +139,9 @@ class MapFileParser ( object ): if self.stop_reading: break + + self.read_lines_done() + return ret # --- end of read_lines (...) --- def read_file ( self, filepath, handle_compressed=True ):