Better time output on build completion.

2 files changed, 22 insertions, 7 deletions

diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index a624c1ebf5..c48816cb5b 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -848,8 +848,8 @@ class Package(object):
                 build_time = self._total_time - self._fetch_time
 
                 tty.msg("Successfully installed %s." % self.name,
-                        "Fetch: %.2f sec.  Build: %.2f sec.  Total: %.2f sec."
-                        % (self._fetch_time, build_time, self._total_time))
+                        "Fetch: %s.  Build: %s.  Total: %s."
+                        % (_hms(self._fetch_time), _hms(build_time), _hms(self._total_time)))
                 print_pkg(self.prefix)
 
                 # Use os._exit here to avoid raising a SystemExit exception,
@@ -1201,6 +1201,18 @@ def print_pkg(message):
     print message
 
 
+def _hms(seconds):
+    """Convert time in seconds to hours, minutes, seconds."""
+    m, s = divmod(seconds, 60)
+    h, m = divmod(m, 60)
+
+    parts = []
+    if h: parts.append("%dh" % h)
+    if m: parts.append("%dm" % m)
+    if s: parts.append("%.2fs" % s)
+    return ' '.join(parts)
+
+
 class FetchError(spack.error.SpackError):
     """Raised when something goes wrong during fetch."""
     def __init__(self, message, long_msg=None):
diff --git a/var/spack/packages/py-pyqt4/package.py b/var/spack/packages/py-pyqt/package.py
index eeb1382560..cb40af351a 100644
--- a/var/spack/packages/py-pyqt4/package.py
+++ b/var/spack/packages/py-pyqt/package.py
@@ -1,18 +1,21 @@
 from spack import *
 
-class PyPyqt4(Package):
-    """PyQt is a set of Python v2 and v3 bindings for Digia's Qt application framework and runs on all platforms supported by Qt including Windows, MacOS/X and Linux."""
+class PyPyqt(Package):
+    """PyQt is a set of Python v2 and v3 bindings for Digia's Qt
+       application framework and runs on all platforms supported by Qt
+       including Windows, MacOS/X and Linux."""
     homepage = "http://www.riverbankcomputing.com/software/pyqt/intro"
     url      = "http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/PyQt-x11-gpl-4.11.3.tar.gz"
 
     version('4.11.3', '997c3e443165a89a559e0d96b061bf70')
 
     extends('python')
-    depends_on('qt')
+    depends_on('qt@4')  # TODO: allow qt5 when conditional deps are supported.
     depends_on('py-sip')
 
     def install(self, spec, prefix):
-        version_array = str(spec['python'].version).split('.')
-        python('configure.py', '--confirm-license', '--destdir=%s/python%s.%s/site-packages' %(self.prefix.lib, version_array[0], version_array[1]))
+        python('configure.py',
+               '--confirm-license',
+               '--destdir=%s' % site_packages_dir)
         make()
         make('install')