[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/packagerules/parser/, roverlay/packagerules/parser/context/, ...

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/packagerules/parser/, roverlay/packagerules/parser/context/, ...

[André Erdmann]

commit:     486d764d1269bfe7e9eb4d6ca807a7c52f2ee744
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 13 16:26:41 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 13 16:26:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=486d764d

remove debug output

---
 roverlay/packagerules/parser/context/match.py | 3 +--
 roverlay/packagerules/parser/namespace.py     | 2 +-
 roverlay/tools/runcmd.py                      | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roverlay/packagerules/parser/context/match.py b/roverlay/packagerules/parser/context/match.py
index d4c206d..e18e92e 100644
--- a/roverlay/packagerules/parser/context/match.py
+++ b/roverlay/packagerules/parser/context/match.py
@@ -216,8 +216,7 @@ class RuleMatchContext (
             # -- if;
 
             self._matches.append (
-               self.namespace.get_object (
-                  op,
+               op (
                   lino,
                   match_type [1],
                   value

diff --git a/roverlay/packagerules/parser/namespace.py b/roverlay/packagerules/parser/namespace.py
index a1d3ff8..6af8661 100644
--- a/roverlay/packagerules/parser/namespace.py
+++ b/roverlay/packagerules/parser/namespace.py
@@ -6,7 +6,7 @@
 
 import roverlay.util
 
-DEBUG_GET_OBJECT = True
+DEBUG_GET_OBJECT = False
 
 if DEBUG_GET_OBJECT:
    def debug_get_object ( msg, cls, args, kwargs ):

diff --git a/roverlay/tools/runcmd.py b/roverlay/tools/runcmd.py
index e6b4f19..cda41d0 100644
--- a/roverlay/tools/runcmd.py
+++ b/roverlay/tools/runcmd.py
@@ -4,12 +4,13 @@
 # Distributed under the terms of the GNU General Public License;
 # either version 2 of the License, or (at your option) any later version.
 
+import logging
 import os
 import subprocess
 
 import roverlay.strutil
 
-DEBUG_TO_CONSOLE = True
+DEBUG_TO_CONSOLE = False
 
 def run_command ( cmdv, env, logger, return_success=False ):
    if DEBUG_TO_CONSOLE:
@@ -26,7 +27,7 @@ def run_command ( cmdv, env, logger, return_success=False ):
    output = cmd_call.communicate()
 
    # log stderr
-   if output [1]:
+   if output [1] and logger.isEnabledFor ( logging.WARNING ):
       for line in roverlay.strutil.pipe_lines ( output [1], use_filter=True ):
          logger.warning ( line )
 

[gentoo-commits] proj/R_overlay:master commit in: roverlay/packagerules/parser/, roverlay/packagerules/parser/context/, ...

[André Erdmann]

commit:     486d764d1269bfe7e9eb4d6ca807a7c52f2ee744
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 13 16:26:41 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 13 16:26:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=486d764d

remove debug output

---
 roverlay/packagerules/parser/context/match.py | 3 +--
 roverlay/packagerules/parser/namespace.py     | 2 +-
 roverlay/tools/runcmd.py                      | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roverlay/packagerules/parser/context/match.py b/roverlay/packagerules/parser/context/match.py
index d4c206d..e18e92e 100644
--- a/roverlay/packagerules/parser/context/match.py
+++ b/roverlay/packagerules/parser/context/match.py
@@ -216,8 +216,7 @@ class RuleMatchContext (
             # -- if;
 
             self._matches.append (
-               self.namespace.get_object (
-                  op,
+               op (
                   lino,
                   match_type [1],
                   value

diff --git a/roverlay/packagerules/parser/namespace.py b/roverlay/packagerules/parser/namespace.py
index a1d3ff8..6af8661 100644
--- a/roverlay/packagerules/parser/namespace.py
+++ b/roverlay/packagerules/parser/namespace.py
@@ -6,7 +6,7 @@
 
 import roverlay.util
 
-DEBUG_GET_OBJECT = True
+DEBUG_GET_OBJECT = False
 
 if DEBUG_GET_OBJECT:
    def debug_get_object ( msg, cls, args, kwargs ):

diff --git a/roverlay/tools/runcmd.py b/roverlay/tools/runcmd.py
index e6b4f19..cda41d0 100644
--- a/roverlay/tools/runcmd.py
+++ b/roverlay/tools/runcmd.py
@@ -4,12 +4,13 @@
 # Distributed under the terms of the GNU General Public License;
 # either version 2 of the License, or (at your option) any later version.
 
+import logging
 import os
 import subprocess
 
 import roverlay.strutil
 
-DEBUG_TO_CONSOLE = True
+DEBUG_TO_CONSOLE = False
 
 def run_command ( cmdv, env, logger, return_success=False ):
    if DEBUG_TO_CONSOLE:
@@ -26,7 +27,7 @@ def run_command ( cmdv, env, logger, return_success=False ):
    output = cmd_call.communicate()
 
    # log stderr
-   if output [1]:
+   if output [1] and logger.isEnabledFor ( logging.WARNING ):
       for line in roverlay.strutil.pipe_lines ( output [1], use_filter=True ):
          logger.warning ( line )