zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Todd Gamblin 2014-09-19 09:43:45 -07:00
commit 115d069677
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/spack/spack/cmd/create.py
View File

@ -36,7 +36,7 @@
import spack.cmd.checksum import spack.cmd.checksum
import spack.package import spack.package
import spack.url import spack.url
from spack.util.naming import mod_to_class from spack.util.naming import *
import spack.util.crypto as crypto import spack.util.crypto as crypto
from spack.util.executable import which from spack.util.executable import which
@ -128,21 +128,22 @@ def create(parser, args):
url = args.url url = args.url
# Try to deduce name and version of the new package from the URL # Try to deduce name and version of the new package from the URL
name, version = spack.url.parse_name_and_version(url) version = spack.url.parse_version(url)
# Use a user-supplied name if one is present
name = kwargs.get(args, 'alternate_name', False)
if args.name:
name = args.name
if not version: if not version:
tty.die("Couldn't guess a version string from %s." % url) tty.die("Couldn't guess a version string from %s." % url)
if not name: # Try to guess a name. If it doesn't work, allow the user to override.
if args.alternate_name:
name = args.alternate_name
else:
try:
name = spack.url.parse_name(url, version)
except spack.url.UndetectableNameError, e:
# Use a user-supplied name if one is present
tty.die("Couldn't guess a name for this package. Try running:", "", tty.die("Couldn't guess a name for this package. Try running:", "",
"spack create --name <name> <url>") "spack create --name <name> <url>")
if not spack.db.valid_name(name): if not valid_module_name(name):
tty.die("Package name can only contain A-Z, a-z, 0-9, '_' and '-'") tty.die("Package name can only contain A-Z, a-z, 0-9, '_' and '-'")
tty.msg("This looks like a URL for %s version %s." % (name, version)) tty.msg("This looks like a URL for %s version %s." % (name, version))