From: Scott Worley Date: Mon, 15 Jun 2020 19:30:15 +0000 (-0700) Subject: Move pin_channel() into ChannelSearchPath.pin() X-Git-Tag: 2.0.0~18 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/f4d3e2010ae1287af696db056828fbb87c8fa1d9?ds=sidebyside;hp=7f4c3ace15d9dc80a366743e5f7a38ec7b2af201 Move pin_channel() into ChannelSearchPath.pin() --- diff --git a/pinch.py b/pinch.py index ea380a3..78c6d52 100644 --- a/pinch.py +++ b/pinch.py @@ -163,7 +163,11 @@ class ChannelSearchPath(TarrableSearchPath): self.old_git_revision = self.git_revision del self.git_revision - pin_channel(v, self) + fetch(v, self) + parse_channel(v, self) + fetch_resources(v, self) + ensure_git_rev_available(v, self) + check_channel_contents(v, self) return ChannelPin( release_name=self.release_name, tarball_url=self.table['nixexprs.tar.xz'].absolute_url, @@ -561,14 +565,6 @@ def check_channel_contents( v.ok() -def pin_channel(v: Verification, channel: TarrableSearchPath) -> None: - fetch(v, channel) - parse_channel(v, channel) - fetch_resources(v, channel) - ensure_git_rev_available(v, channel) - check_channel_contents(v, channel) - - def git_revision_name(v: Verification, channel: TarrableSearchPath) -> str: v.status('Getting commit date') process = subprocess.run(['git',