v.status('Extracting git commit:')
git_commit_node = d.getElementsByTagName('tt')[0]
- channel.git_commit = git_commit_node.firstChild.nodeValue
- v.status(channel.git_commit)
+ channel.git_revision = git_commit_node.firstChild.nodeValue
+ v.status(channel.git_revision)
v.ok()
v.status('Verifying git commit label')
v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ')
v.status('Verifying git commit on main page matches git commit in table')
v.result(
open(
- channel.table['git-revision'].file).read(999) == channel.git_commit)
+ channel.table['git-revision'].file).read(999) == channel.git_revision)
def git_fetch(v: Verification, channel: Channel) -> None:
v.status('Checking if we already have this rev:')
process = subprocess.run(
- ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+ ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
if process.returncode == 0:
v.status('yes')
if process.returncode == 1:
v.result(process.returncode == 0)
v.status('Verifying that fetch retrieved this rev')
process = subprocess.run(
- ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+ ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
v.result(process.returncode == 0)
v.status('Verifying rev is an ancestor of ref')
channel.git_cachedir,
'merge-base',
'--is-ancestor',
- channel.git_commit,
+ channel.git_revision,
channel.git_ref])
v.result(process.returncode == 0)
'-C',
channel.git_cachedir,
'archive',
- channel.git_commit],
+ channel.git_revision],
stdout=subprocess.PIPE)
tar = subprocess.Popen(
['tar', 'x', '-C', dest, '-f', '-'], stdin=git.stdout)
os.path.join(
channel_contents,
channel.release_name,
- '.git-revision')).read(999) == channel.git_commit)
+ '.git-revision')).read(999) == channel.git_revision)
v.status(
'Verifying version-suffix is a suffix of release name %s:' %