diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2015-03-24 10:17:18 -0700 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-03-24 10:17:18 -0700 |
commit | 6776c1945d9d426dad0f2d228a2a7cb073e1c389 (patch) | |
tree | c86c4b40395f1ceb6be3e7a9e9d94b447444c020 /lib | |
parent | 1414480d3afca4a568821bc7d0892a1571b44d6b (diff) | |
parent | b2f54bac9572ce75d8129fb147a6deec3aaca221 (diff) | |
download | spack-0.8.17.tar.gz spack-0.8.17.tar.bz2 spack-0.8.17.tar.xz spack-0.8.17.zip |
Merge for minor release: 0.8.17v0.8.17
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/docs/_themes/sphinx_rtd_theme/layout.html | 11 | ||||
-rw-r--r-- | lib/spack/spack/cmd/spec.py | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html b/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html index 0314a8028a..f629e7d933 100644 --- a/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html +++ b/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html @@ -87,6 +87,17 @@ <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script> + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-55665759-2', 'auto'); + ga('send', 'pageview'); + </script> + </head> <body class="wy-body-for-nav"> diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py index e2cb5689c0..407519313c 100644 --- a/lib/spack/spack/cmd/spec.py +++ b/lib/spack/spack/cmd/spec.py @@ -33,20 +33,27 @@ import spack.url as url description = "print out abstract and concrete versions of a spec." def setup_parser(subparser): + subparser.add_argument('-i', '--ids', action='store_true', + help="show numerical ids for dependencies.") subparser.add_argument('specs', nargs=argparse.REMAINDER, help="specs of packages") + def spec(parser, args): + kwargs = { 'ids' : args.ids, + 'indent' : 2, + 'color' : True } + for spec in spack.cmd.parse_specs(args.specs): print "Input spec" print "------------------------------" - print spec.tree(color=True, indent=2) + print spec.tree(**kwargs) print "Normalized" print "------------------------------" spec.normalize() - print spec.tree(color=True, indent=2) + print spec.tree(**kwargs) print "Concretized" print "------------------------------" spec.concretize() - print spec.tree(color=True, indent=2) + print spec.tree(**kwargs) |