[jhbuild] info: Fix lookup of install, and show installed version



commit 3203501218a78e83f0e545ec7bde68e1f9b0b285
Author: Colin Walters <walters verbum org>
Date:   Mon Oct 3 19:32:39 2011 -0400

    info: Fix lookup of install, and show installed version
    
    The installdate() invocation was buggy since it passed the
    current version of the tree, which meant if the working directory
    differed from the installed, we showed it as NOT installed.
    
    Also, show the installed version in the output in addition to the
    date.

 jhbuild/commands/info.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/commands/info.py b/jhbuild/commands/info.py
index add4b92..b84fcde 100644
--- a/jhbuild/commands/info.py
+++ b/jhbuild/commands/info.py
@@ -56,16 +56,18 @@ class cmd_info(Command):
                 self.show_info(module, packagedb, module_set)
 
     def show_info(self, module, packagedb, module_set):
-        installdate = packagedb.installdate(module.name, module.get_revision() or '')
+        package_entry = packagedb.get(module.name)
 
         uprint(_('Name:'), module.name)
         uprint(_('Module Set:'), module.moduleset_name)
         uprint(_('Type:'), module.type)
 
-        if installdate is not None:
+        if package_entry is not None:
+            uprint(_('Install version:'), package_entry.version)
             uprint(_('Install date:'), time.strftime('%Y-%m-%d %H:%M:%S',
-                                                 time.localtime(installdate)))
+                                                     time.localtime(packagedb.installdate(module.name))))
         else:
+            uprint(_('Install version:'), _('not installed'))
             uprint(_('Install date:'), _('not installed'))
 
         if isinstance(module, MetaModule):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]