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

Merge pull request #851 from mathstuf/safer-bootstrap

Browse Source 
bootstrap: fall back to the default upstream URL
This commit is contained in:
Todd Gamblin 2016-07-18 14:25:29 -07:00 committed by GitHub
commit 51834773b4
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/spack/spack/cmd/bootstrap.py
View File

@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import os import os
from subprocess import check_call
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.filesystem import join_path, mkdirp from llnl.util.filesystem import join_path, mkdirp
@ -31,26 +30,49 @@
import spack import spack
from spack.util.executable import which from spack.util.executable import which
_SPACK_UPSTREAM = 'https://github.com/llnl/spack'
description = "Create a new installation of spack in another prefix" description = "Create a new installation of spack in another prefix"
def setup_parser(subparser): def setup_parser(subparser):
subparser.add_argument('prefix', help="names of prefix where we should install spack") subparser.add_argument(
'-r', '--remote', action='store', dest='remote',
help="name of the remote to bootstrap from", default='origin')
subparser.add_argument(
'prefix',
help="names of prefix where we should install spack")
def get_origin_url(): def get_origin_info(remote):
git_dir = join_path(spack.prefix, '.git') git_dir = join_path(spack.prefix, '.git')
git = which('git', required=True) git = which('git', required=True)
origin_url = git( try:
'--git-dir=%s' % git_dir, 'config', '--get', 'remote.origin.url', branch = git('symbolic-ref', '--short', 'HEAD', output=str)
output=str) except ProcessError:
return origin_url.strip() branch = 'develop'
tty.warn('No branch found; using default branch: %s' % branch)
if remote == 'origin' and \
branch not in ('master', 'develop'):
branch = 'develop'
tty.warn('Unknown branch found; using default branch: %s' % branch)
try:
origin_url = git(
'--git-dir=%s' % git_dir,
'config', '--get', 'remote.%s.url' % remote,
output=str)
except ProcessError:
origin_url = _SPACK_UPSTREAM
tty.warn('No git repository found; '
'using default upstream URL: %s' % origin_url)
return (origin_url.strip(), branch.strip())
def bootstrap(parser, args): def bootstrap(parser, args):
origin_url = get_origin_url() origin_url, branch = get_origin_info(args.remote)
prefix = args.prefix prefix = args.prefix
tty.msg("Fetching spack from origin: %s" % origin_url) tty.msg("Fetching spack from '%s': %s" % (args.remote, origin_url))
if os.path.isfile(prefix): if os.path.isfile(prefix):
tty.die("There is already a file at %s" % prefix) tty.die("There is already a file at %s" % prefix)
@ -62,7 +84,8 @@ def bootstrap(parser, args):
files_in_the_way = os.listdir(prefix) files_in_the_way = os.listdir(prefix)
if files_in_the_way: if files_in_the_way:
tty.die("There are already files there! Delete these files before boostrapping spack.", tty.die("There are already files there! "
"Delete these files before boostrapping spack.",
*files_in_the_way) *files_in_the_way)
tty.msg("Installing:", tty.msg("Installing:",
@ -73,8 +96,10 @@ def bootstrap(parser, args):
git = which('git', required=True) git = which('git', required=True)
git('init', '--shared', '-q') git('init', '--shared', '-q')
git('remote', 'add', 'origin', origin_url) git('remote', 'add', 'origin', origin_url)
git('fetch', 'origin', 'master:refs/remotes/origin/master', '-n', '-q') git('fetch', 'origin', '%s:refs/remotes/origin/%s' % (branch, branch),
git('reset', '--hard', 'origin/master', '-q') '-n', '-q')
git('reset', '--hard', 'origin/%s' % branch, '-q')
git('checkout', '-B', branch, 'origin/%s' % branch, '-q')
tty.msg("Successfully created a new spack in %s" % prefix, tty.msg("Successfully created a new spack in %s" % prefix,
"Run %s/bin/spack to use this installation." % prefix) "Run %s/bin/spack to use this installation." % prefix)