From: Scott Worley Date: Sat, 13 Jun 2020 06:29:55 +0000 (-0700) Subject: Make pin() a Channel method X-Git-Tag: 2.0.0~30 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/3aa393bbc0cd6dd203cd69024112afc62d521581?hp=faff8642d1b68a819a41186ec720a0f00f43f712 Make pin() a Channel method --- diff --git a/pinch.py b/pinch.py index a8af6a6..d346a14 100644 --- a/pinch.py +++ b/pinch.py @@ -100,6 +100,25 @@ class Channel(SearchPath): old_git_revision: str table: Dict[str, ChannelTableEntry] + def pin(self, v: Verification, conf: configparser.SectionProxy) -> None: + if hasattr(self, 'alias_of'): + assert not hasattr(self, 'git_repo') + return + + if hasattr(self, 'git_revision'): + self.old_git_revision = self.git_revision + del self.git_revision + + if 'channel_url' in conf: + pin_channel(v, self) + conf['release_name'] = self.release_name + conf['tarball_url'] = self.table['nixexprs.tar.xz'].absolute_url + conf['tarball_sha256'] = self.table['nixexprs.tar.xz'].digest + else: + git_fetch(v, self) + conf['release_name'] = git_revision_name(v, self) + conf['git_revision'] = self.git_revision + def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]: @@ -512,23 +531,7 @@ def pin(args: argparse.Namespace) -> None: channel = read_search_path(config[section]) - if hasattr(channel, 'alias_of'): - assert not hasattr(channel, 'git_repo') - continue - - if hasattr(channel, 'git_revision'): - channel.old_git_revision = channel.git_revision - del channel.git_revision - - if 'channel_url' in config[section]: - pin_channel(v, channel) - config[section]['release_name'] = channel.release_name - config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url - config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest - else: - git_fetch(v, channel) - config[section]['release_name'] = git_revision_name(v, channel) - config[section]['git_revision'] = channel.git_revision + channel.pin(v, config[section]) with open(args.channels_file, 'w') as configfile: config.write(configfile)