summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-01-12 11:37:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2006-01-12 11:37:45 +0100
commit6a7d3c4fdea2f85b100bbccaabb41637450e78e6 (patch)
tree1c93761a6c4e49ade759b782886c7ec487bf6ea3
parente838d3497a3590d4ddadb793ead655d223cf21d8 (diff)
downloadpython-apt-6a7d3c4fdea2f85b100bbccaabb41637450e78e6.tar.gz
* the log includes timing information as well now
* give a start/end markeer for the obsoletes calculation to see how long it takes
-rw-r--r--DistUpgrade/DistUpgradeControler.py4
-rwxr-xr-xDistUpgrade/dist-upgrade.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 22f74842..58d8fb16 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -388,6 +388,7 @@ class DistUpgradeControler(object):
# before) to be deleted. make sure to not delete any foreign
# (that is, not from ubuntu) packages
remove_candidates = now_obsolete - self.obsolete_pkgs
+ logging.debug("Start checking for obsolete pkgs")
for pkgname in remove_candidates:
if pkgname not in self.foreign_pkgs:
# this is a delete candidate, only actually delete,
@@ -398,8 +399,9 @@ class DistUpgradeControler(object):
for pkg in self.cache.getChanges():
if pkg.name not in remove_candidates or \
pkg.name in self.foreign_pkgs:
- logging.debug("'%s' scheduled for remove but in remove_candiates, skipping", pkg.name)
+ logging.debug("'%s' scheduled for remove but not in remove_candiates, skipping", pkg.name)
self.cache.restore_snapshot()
+ logging.debug("Finish checking for obsolete pkgs")
if self._view.confirmChanges(_("Remove obsolete Packages?"),
self.cache.getChanges(), 0):
fprogress = self._view.getFetchProgress()
diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py
index fa04adec..42904444 100755
--- a/DistUpgrade/dist-upgrade.py
+++ b/DistUpgrade/dist-upgrade.py
@@ -12,7 +12,7 @@ if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG,
filename=os.path.expanduser("~/dist-upgrade.log"),
- format='%(levelname)s %(message)s',
+ format='%(asctime)s %(levelname)s %(message)s',
filemode='w')
app.run()