Refactor log code to its own module.

[wizard.git] / wizard / command / info.py

diff --git a/wizard/command/info.py b/wizard/command/info.py
index 2673bac4051d1225676637567be5609f63380a85..04ed70d7a9d389265d65eeec917afc3d04f43462 100644 (file)
--- a/wizard/command/info.py
+++ b/wizard/command/info.py
@@ -3,10 +3,11 @@ import sys
 import subprocess
 
 from wizard import deploy
+from wizard import log
 
 def main(argv, baton):
     options, args = parse_args(argv)
-    d = deploy.Deployment.fromDir(args[0])
+    d = deploy.Deployment(args[0])
     d.log # force the log to be loaded, to pre-empt errors
     with PipeToLess():
         print_log(d, options)
@@ -28,16 +29,16 @@ including its history and current version."""
 
 def print_log(d, options):
     if options.reverse:
-        log = reversed(d.log)
+        dlog = reversed(d.log)
     else:
-        log = d.log
-    for entry in log:
+        dlog = d.log
+    for entry in dlog:
         print "%s %s" % (entry.version.application.name, entry.version.version)
         print "User: %s" % entry.user
         print "Date: %s" % entry.datetime.strftime("%a %b %0d %H:%M:%S %Y %z")
         print
         info = "Unknown"
-        if isinstance(entry.source, deploy.TarballInstall):
+        if isinstance(entry.source, log.TarballInstall):
             info = "Installed with tarball at:\n%s" % \
                 prettify(entry.source.location)
         print indent(info, 4)