YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Improve and fix app fetching other than from github

Browse source
This commit is contained in:
Jérôme Lebleu 2016-02-21 17:24:05 +01:00
parent bd7308187c
commit ca9abffbe8
1 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/yunohost/app.py
View file

@ -1151,12 +1151,11 @@ def _fetch_app_from_git(app):
Dict manifest Dict manifest
""" """
global app_tmp_folder if os.path.exists(app_tmp_folder):
shutil.rmtree(app_tmp_folder)
msignals.display(m18n.n('downloading')) msignals.display(m18n.n('downloading'))
git_result_2 = 1
if ('@' in app) or ('http://' in app) or ('https://' in app): if ('@' in app) or ('http://' in app) or ('https://' in app):
url = app url = app
branch = 'master' branch = 'master'
@ -1185,26 +1184,30 @@ def _fetch_app_from_git(app):
if tree_index > 0: if tree_index > 0:
url = url[:tree_index] url = url[:tree_index]
branch = app[tree_index+6:] branch = app[tree_index+6:]
git_result = os.system('git clone --depth=1 %s %s' % (app, app_tmp_folder))
git_result_2 = 0
try: try:
with open(app_tmp_folder + '/manifest.json') as json_manifest: subprocess.check_call([
manifest = json.loads(str(json_manifest.read())) 'git', 'clone', '--depth=1', url, app_tmp_folder])
manifest['lastUpdate'] = int(time.time()) subprocess.check_call([
'git', 'reset', '--hard', branch
], cwd=app_tmp_folder)
with open(app_tmp_folder + '/manifest.json') as f:
manifest = json.loads(str(f.read()))
except subprocess.CalledProcessError:
raise MoulinetteError(errno.EIO,
m18n.n('app_sources_fetch_failed'))
except IOError: except IOError:
raise MoulinetteError(errno.EIO, m18n.n('app_manifest_invalid')) raise MoulinetteError(errno.EIO,
m18n.n('app_manifest_invalid'))
else:
msignals.display(m18n.n('done'))
# Store remote repository info into the returned manifest # Store remote repository info into the returned manifest
manifest['remote'] = {'type': 'git', 'url': app, 'branch': branch} manifest['remote'] = {'type': 'git', 'url': url, 'branch': branch}
try: try:
revision = _get_git_last_commit_hash(url, branch) revision = _get_git_last_commit_hash(url, branch)
except: pass except: pass
else: else:
manifest['remote']['revision'] = revision manifest['remote']['revision'] = revision
if git_result_2 == 1:
return manifest
else: else:
app_dict = app_list(raw=True) app_dict = app_list(raw=True)
@ -1232,31 +1235,33 @@ def _fetch_app_from_git(app):
raise MoulinetteError(errno.EIO, raise MoulinetteError(errno.EIO,
m18n.n('app_sources_fetch_failed')) m18n.n('app_sources_fetch_failed'))
else: else:
git_result_2 = 0 try:
subprocess.check_call([
'git', 'clone', app_info['git']['url'],
'-b', app_info['git']['branch'], app_tmp_folder])
subprocess.check_call([
'git', 'reset', '--hard',
str(app_info['git']['revision'])
], cwd=app_tmp_folder)
with open(app_tmp_folder + '/manifest.json') as f:
manifest = json.loads(str(f.read()))
except subprocess.CalledProcessError:
raise MoulinetteError(errno.EIO,
m18n.n('app_sources_fetch_failed'))
except IOError:
raise MoulinetteError(errno.EIO,
m18n.n('app_manifest_invalid'))
else:
msignals.display(m18n.n('done'))
# Store remote repository info into the returned manifest # Store remote repository info into the returned manifest
manifest['remote'] = { manifest['remote'] = {
'type': 'git', 'type': 'git',
'url': app_info['git']['url'], 'url': url,
'branch': app_info['git']['branch'], 'branch': app_info['git']['branch'],
'revision': app_info['git']['revision'], 'revision': app_info['git']['revision'],
} }
if git_result_2 == 1:
return manifest
app_tmp_folder = install_tmp +'/'+ app
if os.path.exists(app_tmp_folder): shutil.rmtree(app_tmp_folder)
# FIXME: maybe store the fetched manifest??
git_result = os.system('git clone %s -b %s %s' % (app_info['git']['url'], app_info['git']['branch'], app_tmp_folder))
git_result_2 = os.system('cd %s && git reset --hard %s' % (app_tmp_folder, str(app_info['git']['revision'])))
if not git_result == git_result_2 == 0:
raise MoulinetteError(errno.EIO, m18n.n('app_sources_fetch_failed'))
msignals.display(m18n.n('done'))
return manifest return manifest