revisor/__init__.py.in | 5 +++++
revisor/base.py | 2 +-
revisor/logger.py | 4 ++--
revisor/misc.py | 9 ++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit bfd709e4c761b47c7a40ae32dcbb886b59ea3981
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Sun Mar 8 17:49:01 2009 +0100
Add --logfile
State start and end times of inclusive dependency resolving
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 8457920..df91404 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -155,6 +155,11 @@ class Revisor:
type = 'int',
help = _("Set debugging level (0 by
default)"))
+ runtime_group.add_option( "--logfile",
+ dest = "logfile",
+ default = "/var/log/revisor.log",
+ help = _("Use a different logfile"))
+
##
## Redundant Options
##
diff --git a/revisor/base.py b/revisor/base.py
index 84c91cd..4f85393 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -142,7 +142,7 @@ class RevisorBase:
self.cli_options.debuglevel = 0
# Initialize logger
- self.log = revisor.logger.Logger(loglevel=loglevel,
debuglevel=self.cli_options.debuglevel)
+ self.log = revisor.logger.Logger(loglevel=loglevel,
debuglevel=self.cli_options.debuglevel, logfile=self.cli_options.logfile)
def create_configstore(self):
"""Initialize Configuration Store"""
diff --git a/revisor/logger.py b/revisor/logger.py
index a915116..6a5cff1 100644
--- a/revisor/logger.py
+++ b/revisor/logger.py
@@ -25,7 +25,7 @@ import sys
from rhpl.translate import _
class Logger:
- def __init__(self, loglevel=logging.INFO, debuglevel=0):
+ def __init__(self, loglevel=logging.INFO, debuglevel=0,
logfile="/var/log/revisor.log"):
self.loglevel = loglevel
self.debuglevel = debuglevel
@@ -34,7 +34,7 @@ class Logger:
console_stdout = logging.StreamHandler(sys.stdout)
console_stdout.setFormatter(plaintextformatter)
- filelog_handler = logging.FileHandler(filename="/var/log/revisor.log")
+ filelog_handler = logging.FileHandler(filename=logfile)
filelog_handler.setFormatter(plaintextformatter)
self.log = logging.getLogger()
diff --git a/revisor/misc.py b/revisor/misc.py
index 8df46bc..1a20b86 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -17,6 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+import datetime
import logging
import os
import re
@@ -159,8 +160,12 @@ def resolve_dependencies_inclusive(yumobj, logger=None,
pbar=None, resolved_deps
logger.debug(_("Checking dependencies - allowing conflicts within the
package set"), level=5)
reqs = []
+
+ logger.debug(_("Inclusive dependency resolving starts at %s") %
datetime.datetime.now(), level=8)
+
for txmbr in yumobj.tsInfo.getMembers():
- reqs.append(txmbr.po.requires)
+ reqs.extend(txmbr.po.requires)
+
reqs = yum.misc.unique(reqs)
moretoprocess = True
@@ -172,6 +177,8 @@ def resolve_dependencies_inclusive(yumobj, logger=None,
pbar=None, resolved_deps
(resolved_deps, final_pkgobjs) = get_package_deps(yumobj,
txmbr.po, pbar, logger=logger, resolved_deps=resolved_deps,
final_pkgobjs=final_pkgobjs)
moretoprocess = True
+ logger.debug(_("Inclusive dependency resolving ends at %s") %
datetime.datetime.now(), level=8)
+
return (resolved_deps, final_pkgobjs)
#yumobj.tsInfo.makelists()
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
