From: Scott Worley Date: Fri, 29 May 2020 06:52:01 +0000 (-0700) Subject: Factor out fetch_channel X-Git-Tag: 1.3~3 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/10ddbaff0197f0ef93a910d7ea3f9f7d0ebac3a4?hp=8ce159d26ebefd19a7ac6ef8c0c64b460cfcf384 Factor out fetch_channel Appeases pylint's "Too many branches" --- diff --git a/pinch.py b/pinch.py index f84440c..10481e4 100644 --- a/pinch.py +++ b/pinch.py @@ -497,6 +497,25 @@ def pin(args: argparse.Namespace) -> None: config.write(configfile) +def fetch_channel( + v: Verification, + section: str, + conf: configparser.SectionProxy) -> str: + if 'git_repo' not in conf or 'release_name' not in conf: + raise Exception( + 'Cannot update unpinned channel "%s" (Run "pin" before "update")' % + section) + + if 'channel_url' in conf: + return fetch_with_nix_prefetch_url( + v, conf['tarball_url'], Digest16( + conf['tarball_sha256'])) + + channel = Channel(**dict(conf.items())) + ensure_git_rev_available(v, channel) + return git_get_tarball(v, channel) + + def update(args: argparse.Namespace) -> None: v = Verification() config = configparser.ConfigParser() @@ -504,25 +523,10 @@ def update(args: argparse.Namespace) -> None: configs = [read_config(filename) for filename in args.channels_file] for config in configs: for section in config.sections(): - if 'alias_of' in config[section]: assert 'git_repo' not in config[section] continue - - if 'git_repo' not in config[section] or 'release_name' not in config[section]: - raise Exception( - 'Cannot update unpinned channel "%s" (Run "pin" before "update")' % - section) - - if 'channel_url' in config[section]: - tarball = fetch_with_nix_prefetch_url( - v, config[section]['tarball_url'], Digest16( - config[section]['tarball_sha256'])) - else: - channel = Channel(**dict(config[section].items())) - ensure_git_rev_available(v, channel) - tarball = git_get_tarball(v, channel) - + tarball = fetch_channel(v, section, config[section]) if section in exprs: raise Exception('Duplicate channel "%s"' % section) exprs[section] = (