Skip to content

Commit

Permalink
Merge pull request #569 from kyleam/datalad-sub-compat
Browse files Browse the repository at this point in the history
BF: orchestrators: Update for change in 'datalad subdatasets' key
  • Loading branch information
yarikoptic authored Feb 1, 2021
2 parents 6717f81 + f0945d9 commit b6a29bd
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion reproman/support/jobs/orchestrators.py
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,14 @@ def _fix_up_dataset(self):
cwd = res["path"]
self._assert_clean_repo(cwd=cwd)
lgr.debug("Adjusting state of %s", cwd)
cmds = [["git", "checkout", res["revision"]],
# "gitshasum" replaced "revision" in v0.12, with the old name kept
# for compatibility until v0.14. Even though the minimum version
# for DataLad in setup.py is above 0.12, support both keys until
# the minimum version for the _remote_ is specified/checked (see
# gh-477).
revision = res.get("gitshasum", res.get("revision"))
assert revision, "bug: incorrectly assumed revision is in results"
cmds = [["git", "checkout", revision],
["git", "annex", "init"]]
for cmd in cmds:
try:
Expand Down

0 comments on commit b6a29bd

Please sign in to comment.