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 1F180138EF4 for ; Sat, 22 Feb 2014 14:56:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 411F4E0CBA; Sat, 22 Feb 2014 14:56:05 +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 58DF4E0CB9 for ; Sat, 22 Feb 2014 14:56:04 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55D3733FAD4 for ; Sat, 22 Feb 2014 14:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 606DD188D2 for ; Sat, 22 Feb 2014 14:56:01 +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: <1393078992.b60aa29c76d44975a20ef6206473aa266947e225.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/reader.py 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: b60aa29c76d44975a20ef6206473aa266947e225 X-VCS-Branch: master Date: Sat, 22 Feb 2014 14:56:01 +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: 1f23dc52-6dde-4bf7-8b67-20fe567f7580 X-Archives-Hash: 6aa73fb8c4aa1181bb8458ae1559e8e8 commit: b60aa29c76d44975a20ef6206473aa266947e225 Author: André Erdmann mailerd de> AuthorDate: Fri Feb 21 23:00:06 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Sat Feb 22 14:23:12 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b60aa29c roverlay/depres, rule reader: properly count files fix a small bug that affects logging only where SimpleDependencyRuleReader.read() always reports a file count of 0. Also, remove an unnecessary "self._pool_add is [not] None" check. --- roverlay/depres/simpledeprule/reader.py | 16 +++++++--------- roverlay/depres/simpledeprule/rulemaker.py | 5 +++++ roverlay/util/mapreader.py | 10 ++++++++++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/roverlay/depres/simpledeprule/reader.py b/roverlay/depres/simpledeprule/reader.py index 22f3cf3..3cdc7cf 100644 --- a/roverlay/depres/simpledeprule/reader.py +++ b/roverlay/depres/simpledeprule/reader.py @@ -36,8 +36,6 @@ class SimpleDependencyRuleReader ( object ): self._pool_add = pool_add self._when_done = when_done - - self._fcount = 0 # --- end of __init__ (...) --- def read ( self, files_or_dirs ): @@ -52,17 +50,17 @@ class SimpleDependencyRuleReader ( object ): "Read method is for resolver, but pool_add is None." ) + self._rmaker.file_count = 0 self.read_files ( files_or_dirs ) rule_count, pools = self._rmaker.done ( as_pool=True ) self.logger.debug ( "Read {} rules in {} files.".format ( - rule_count, self._fcount + rule_count, self._rmaker.file_count ) ) - if self._pool_add is not None: - for p in pools: self._pool_add ( p ) - if self._when_done is not None: - self._when_done() - else: - return pools + for p in pools: + self._pool_add ( p ) + + if self._when_done is not None: + self._when_done() # --- end of read (...) --- diff --git a/roverlay/depres/simpledeprule/rulemaker.py b/roverlay/depres/simpledeprule/rulemaker.py index 5daf058..8a4acc5 100644 --- a/roverlay/depres/simpledeprule/rulemaker.py +++ b/roverlay/depres/simpledeprule/rulemaker.py @@ -47,6 +47,7 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ): self.deptype_kw = 'deptype' self._deptype = deptype.ALL self._deptype_once = deptype.NONE + self.file_count = 0 # --- end of __init__ (...) --- def has_context ( self ): @@ -62,6 +63,10 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ): self._deptype_once = deptype.NONE # --- end of read_lines_begin (...) --- + def read_file_done ( self, filepath ): + self.file_count += 1 + # --- end of read_file_done (...) --- + 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 36f4ba7..9ee0944 100644 --- a/roverlay/util/mapreader.py +++ b/roverlay/util/mapreader.py @@ -150,8 +150,17 @@ class MapFileParser ( object ): return ret # --- end of read_lines (...) --- + def read_file_begin ( self, filepath ): + pass + # --- end of read_file_begin (...) --- + + def read_file_done ( self, filepath ): + pass + # --- end of read_file_done (...) --- + def read_file ( self, filepath, handle_compressed=True ): ret = None + self.read_file_begin ( filepath ) try: if handle_compressed: ret = self.read_lines ( @@ -166,6 +175,7 @@ class MapFileParser ( object ): ) raise + self.read_file_done ( filepath ) return ret # --- end of read_file (...) ---