Skip to content

Commit 518216c

Browse files
author
gon
committed
libsodium-recipe-update to url
1 parent 5cedc80 commit 518216c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

pythonforandroid/recipes/libsodium/__init__.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from pythonforandroid.util import current_directory
33
from pythonforandroid.logger import shprint, error
44
from multiprocessing import cpu_count
5-
import sh
6-
75
from urllib.request import urlopen
8-
import json
96
from os import environ
7+
import json
8+
import sh
9+
1010

1111
def get_libsodium_urls():
1212
"""
@@ -21,8 +21,8 @@ def get_libsodium_urls():
2121
urls = {}
2222
for release in releases:
2323
version = release['name']
24+
file_name = 'libsodium-{}.tar.gz'.format(version)
2425
for asset in release['assets']:
25-
file_name = 'libsodium-{}.tar.gz'.format(version)
2626
if asset['name'] == file_name:
2727
download_url = asset['browser_download_url']
2828
urls[version] = download_url.replace(version, '{version}')
@@ -32,10 +32,11 @@ def get_libsodium_urls():
3232
try:
3333
URLS = get_libsodium_urls()
3434
except:
35-
message = 'failed to get libsodium repo assets'
35+
message = 'failed to get libsodium url formats'
3636
error(message)
3737
raise Exception(message)
3838

39+
3940
class LibsodiumRecipe(Recipe):
4041
env_version = environ.get('VERSION_libsodium')
4142
if not env_version:
@@ -45,7 +46,7 @@ class LibsodiumRecipe(Recipe):
4546
try:
4647
url = URLS[version]
4748
except KeyError:
48-
message = 'libsodium {} not found in repo assets'.format(version)
49+
message = "libsodium version '{}' not found".format(version)
4950
error(message)
5051
raise Exception(message)
5152
depends = []

0 commit comments

Comments
 (0)