From 5829b44648f809a09d006b044d8244254a3d224a Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 9 Jul 2014 01:37:24 -0700 Subject: Fix Jeff Keasler's issues and add parmetis package. --- lib/spack/spack/cmd/create.py | 5 ++--- lib/spack/spack/cmd/edit.py | 5 ++--- lib/spack/spack/hooks/dotkit.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index cc2e0dd384..cc9a1342e7 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -36,7 +36,7 @@ import spack.cmd import spack.cmd.checksum import spack.package import spack.url -import spack.packages as packages +from spack.util.naming import mod_to_class import spack.util.crypto as crypto from spack.util.executable import which @@ -157,7 +157,6 @@ def create(parser, args): else: mkdirp(os.path.dirname(pkg_path)) - class_name = packages.class_name_for_package_name(name) versions = list(reversed(spack.package.find_versions_of_archive(url))) archives_to_fetch = 1 @@ -194,7 +193,7 @@ def create(parser, args): package_template.substitute( name=name, configure=guesser.configure, - class_name=class_name, + class_name=mod_to_class(name), url=url, versions=make_version_dict(ver_hash_tuples))) diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index fd77e390ee..c96cf75c9b 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -30,7 +30,7 @@ import llnl.util.tty as tty from llnl.util.filesystem import mkdirp import spack -import spack.packages as packages +from spack.util.naming import mod_to_class description = "Open package files in $EDITOR" @@ -80,10 +80,9 @@ def edit(parser, args): "to edit a new file." % name) else: mkdirp(os.path.dirname(path)) - class_name = packages.class_name_for_package_name(name) with closing(open(path, "w")) as pkg_file: pkg_file.write( - package_template.substitute(name=name, class_name=class_name)) + package_template.substitute(name=name, class_name=mod_to_class(name))) # If everything checks out, go ahead and edit. spack.editor(path) diff --git a/lib/spack/spack/hooks/dotkit.py b/lib/spack/spack/hooks/dotkit.py index f9920e3622..10b7732353 100644 --- a/lib/spack/spack/hooks/dotkit.py +++ b/lib/spack/spack/hooks/dotkit.py @@ -28,7 +28,7 @@ import textwrap import shutil from contextlib import closing -from llnl.util.filesystem import join_path +from llnl.util.filesystem import join_path, mkdirp import spack -- cgit v1.2.3-70-g09d2