diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-10-09 13:05:16 +0100 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-04 12:40:54 +0000 |
commit | cb13a25ed656a8361bb36328897d52e06d2b30fe (patch) | |
tree | afa9006c495081907829a07826bf2daab0838249 | |
parent | 76efe9188bdaff089106a8ae4bca2aef885c33d3 (diff) | |
download | import-cb13a25ed656a8361bb36328897d52e06d2b30fe.tar.gz |
Be more verbose
-rwxr-xr-x | import/pip.to_lorry | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/import/pip.to_lorry b/import/pip.to_lorry index 22de654..b9c4223 100755 --- a/import/pip.to_lorry +++ b/import/pip.to_lorry @@ -71,8 +71,6 @@ def get_compression(url): 'tar.bz2': bzip, 'tbz2': bzip, 'tar.lzma': lzma, 'tar.xz': lzma, 'tlz': lzma, 'txz': lzma} - print(url) - ext = '.'.join(url.split('.')[-2:]) if ext in m: return m[ext] @@ -129,11 +127,21 @@ def generate_lorry_from_tarball(package_name): if len(releases) > 1 else 0) release_version = releases[choice] - urls = filter_urls(client.release_urls(package_name, release_version)) - - if len(urls) == 0: - print("Couldn't get download urls for package %s with release %s, exiting" - % (package_name, release_version), file=sys.stderr) + print('Fetching urls for package %s with version %s' + % (package_name, release_version)) + urls = client.release_urls(package_name, release_version) + tarball_urls = filter_urls(urls) + + if len(tarball_urls) > 0: + urls = tarball_urls + elif len(urls) > 0: + print("None of these urls look like tarballs:", file=sys.stderr) + for url in urls: + print("\t%s", url, file=sys.stderr) + print("Cannot proceed, exiting", file=sys.stderr) + sys.exit(1) + else: + print("Couldn't find any download urls for package, exiting", file=sys.stderr) sys.exit(1) choice = (ask_user(client, urls, lambda url: url['url'], |