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

Add submodules option for git fetching.

Browse Source
This commit is contained in:
Todd Gamblin 2016-07-11 11:56:36 -07:00
parent 255d05a9c1
commit 86b1b28906
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/spack/fetch_strategy.py
View File

@ -366,8 +366,8 @@ def fetch(self):
try: try:
self.check() self.check()
except ChecksumError: except ChecksumError:
# Future fetchers will assume they don't need to download if the # Future fetchers will assume they don't need to
# file remains # download if the file remains
os.remove(self.archive_file) os.remove(self.archive_file)
raise raise
@ -517,6 +517,7 @@ def __init__(self, **kwargs):
super(GitFetchStrategy, self).__init__( super(GitFetchStrategy, self).__init__(
'git', 'tag', 'branch', 'commit', **forwarded_args) 'git', 'tag', 'branch', 'commit', **forwarded_args)
self._git = None self._git = None
self.submodules = kwargs.get('submodules', False)
@property @property
def git_version(self): def git_version(self):
@ -595,6 +596,10 @@ def fetch(self):
self.git('pull', '--tags', ignore_errors=1) self.git('pull', '--tags', ignore_errors=1)
self.git('checkout', self.tag) self.git('checkout', self.tag)
# Init submodules if the user asked for them.
if self.submodules:
self.git('submodule', 'update', '--init')
def archive(self, destination): def archive(self, destination):
super(GitFetchStrategy, self).archive(destination, exclude='.git') super(GitFetchStrategy, self).archive(destination, exclude='.git')