Skip to content

Commit

Permalink
Apply redirection of logger in pre_configure(RhBug:1499623)
Browse files Browse the repository at this point in the history
It should redirect also information about added repos from "--repofrompath".

Additionally the redirection is applied for "search" command.

https://bugzilla.redhat.com/show_bug.cgi?id=1499623

Closes: rpm-software-management#954
Approved by: m-blaha
  • Loading branch information
j-mracek authored and rh-atomic-bot committed Oct 16, 2017
1 parent 48e4d1f commit bf61173
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 4 additions & 2 deletions dnf/cli/commands/repolist.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ def set_argparser(parser):
choices=['all', 'enabled', 'disabled'],
action=OptionParser.PkgNarrowCallback)

def pre_configure(self):
if not self.opts.verbose and not self.opts.quiet:
self.cli.redirect_logger(stdout=logging.WARNING, stderr=logging.INFO)

def configure(self):
demands = self.cli.demands
demands.available_repos = True
demands.fresh_metadata = False
demands.sack_activation = True
if not self.opts.verbose and not self.opts.quiet:
self.cli.redirect_logger(stdout=logging.WARNING, stderr=logging.INFO)

if self.opts._repos_action:
self.opts.repos_action = self.opts._repos_action
Expand Down
7 changes: 4 additions & 3 deletions dnf/cli/commands/repoquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,10 @@ def set_argparser(parser):
const="unneeded", help=argparse.SUPPRESS)
parser.add_argument('--recent', action="store_true", help=_('Display only recently edited packages'))

def pre_configure(self):
if not self.opts.verbose and not self.opts.quiet:
self.cli.redirect_logger(stdout=logging.WARNING, stderr=logging.INFO)

def configure(self):
demands = self.cli.demands

Expand All @@ -243,9 +247,6 @@ def configure(self):
else:
self.opts.packageatr = "obsoletes"

if not self.opts.verbose and not self.opts.quiet:
self.cli.redirect_logger(stdout=logging.WARNING, stderr=logging.INFO)

if self.opts.querytags:
return

Expand Down
4 changes: 4 additions & 0 deletions dnf/cli/commands/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ def _search_counted(self, counter, attr, needle):
counter.add(pkg, attr, needle)
return counter

def pre_configure(self):
if not self.opts.verbose and not self.opts.quiet:
self.cli.redirect_logger(stdout=logging.WARNING, stderr=logging.INFO)

def configure(self):
demands = self.cli.demands
demands.available_repos = True
Expand Down

0 comments on commit bf61173

Please sign in to comment.