diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-06-13 17:53:09 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-06-13 17:53:09 -0700 |
| commit | b8aeab0439f7b0ad99c72f8726ff1b2263a9d998 (patch) | |
| tree | b8982475babae3fc7481bd5a3a04e9fab6f33335 | |
| parent | 277df086769a279064bf36740d29bcdb22a562e4 (diff) | |
| parent | cfb883646f91165c9d839c819519e0c6cea31f47 (diff) | |
| download | spack-b8aeab0439f7b0ad99c72f8726ff1b2263a9d998.tar.gz spack-b8aeab0439f7b0ad99c72f8726ff1b2263a9d998.tar.bz2 spack-b8aeab0439f7b0ad99c72f8726ff1b2263a9d998.tar.xz spack-b8aeab0439f7b0ad99c72f8726ff1b2263a9d998.zip | |
Merge branch 'trws-git-tag-support' into develop
| -rw-r--r-- | lib/spack/spack/fetch_strategy.py | 12 | ||||
| -rw-r--r-- | lib/spack/spack/util/executable.py | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index e46ec74e09..0ba0251caa 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -417,12 +417,18 @@ class GitFetchStrategy(VCSFetchStrategy): # If we want a particular branch ask for it. if self.branch: args.extend(['--branch', self.branch]) + elif self.tag and self.git_version >= ver('1.8.5.2'): + args.extend(['--branch', self.tag]) # Try to be efficient if we're using a new enough git. # This checks out only one branch's history if self.git_version > ver('1.7.10'): args.append('--single-branch') + # Yet more efficiency, only download a 1-commit deep tree + if self.git_version >= ver('1.7.1'): + args.extend(['--depth','1']) + args.append(self.url) self.git(*args) self.stage.chdir_to_source() @@ -430,7 +436,11 @@ class GitFetchStrategy(VCSFetchStrategy): # For tags, be conservative and check them out AFTER # cloning. Later git versions can do this with clone # --branch, but older ones fail. - if self.tag: + if self.tag and self.git_version < ver('1.8.5.2'): + # pull --tags returns a "special" error code of 1 in + # older versions that we have to ignore. + # see: https://github.com/git/git/commit/19d122b + self.git('pull', '--tags', ignore_errors=1) self.git('checkout', self.tag) diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index 1dcda0d87f..67e8cddd98 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -57,8 +57,13 @@ class Executable(object): """Run the executable with subprocess.check_output, return output.""" return_output = kwargs.get("return_output", False) fail_on_error = kwargs.get("fail_on_error", True) + ignore_errors = kwargs.get("ignore_errors", ()) error = kwargs.get("error", sys.stderr) + # if they just want to ignore one error code, make it a tuple. + if isinstance(ignore_errors, int): + ignore_errors = (ignore_errors,) + quoted_args = [arg for arg in args if re.search(r'^"|^\'|"$|\'$', arg)] if quoted_args: tty.warn("Quotes in command arguments can confuse scripts like configure.", @@ -85,7 +90,8 @@ class Executable(object): out, err = proc.communicate() self.returncode = proc.returncode - if fail_on_error and proc.returncode != 0: + rc = proc.returncode + if fail_on_error and rc != 0 and (rc not in ignore_errors): raise ProcessError("Command exited with status %d:" % proc.returncode, cmd_line) if return_output: |