rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Fix downloader url parsing and add submodule git support.

Browse Source 
Split the URL by line breaks into separate requests.

With git reset the repo with each run. First perform a hard reset
to remove any local patches and then switch back to master incase
the repo was left on a branch or a detached head.
This commit is contained in:
Chris Johns 2014-02-04 18:23:08 +11:00
parent 5601b9ccae
commit 53b918e698
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source-builder/sb/download.py
View File

@ -203,9 +203,14 @@ def _git_downloader(url, local, config, opts):
log.notice('git: clone: %s -> %s' % (us[0], rlp)) log.notice('git: clone: %s -> %s' % (us[0], rlp))
if not opts.dry_run(): if not opts.dry_run():
repo.clone(us[0], local) repo.clone(us[0], local)
else:
repo.reset('--hard')
repo.checkout('master')
for a in us[1:]: for a in us[1:]:
_as = a.split('=') _as = a.split('=')
if _as[0] == 'branch': if _as[0] == 'branch' or _as[0] == 'checkout':
if len(_as) != 2:
raise error.general('invalid git branch/checkout: %s' % (_as))
log.notice('git: checkout: %s => %s' % (us[0], _as[1])) log.notice('git: checkout: %s => %s' % (us[0], _as[1]))
if not opts.dry_run(): if not opts.dry_run():
repo.checkout(_as[1]) repo.checkout(_as[1])
@ -213,6 +218,12 @@ def _git_downloader(url, local, config, opts):
log.notice('git: pull: %s' % (us[0])) log.notice('git: pull: %s' % (us[0]))
if not opts.dry_run(): if not opts.dry_run():
repo.pull() repo.pull()
elif _as[0] == 'submodule':
if len(_as) != 2:
raise error.general('invalid git submodule: %s' % (_as))
log.notice('git: submodule: %s <= %s' % (us[0], _as[1]))
if not opts.dry_run():
repo.submodule(_as[1])
elif _as[0] == 'fetch': elif _as[0] == 'fetch':
log.notice('git: fetch: %s -> %s' % (us[0], rlp)) log.notice('git: fetch: %s -> %s' % (us[0], rlp))
if not opts.dry_run(): if not opts.dry_run():
@ -296,7 +307,7 @@ def get_file(url, local, opts, config):
if not path.exists(local) and opts.download_disabled(): if not path.exists(local) and opts.download_disabled():
raise error.general('source not found: %s' % (path.host(local))) raise error.general('source not found: %s' % (path.host(local)))
# #
# Check if a URL hasbeen provided on the command line. # Check if a URL has been provided on the command line.
# #
url_bases = opts.urls() url_bases = opts.urls()
urls = [] urls = []
@ -311,12 +322,12 @@ def get_file(url, local, opts, config):
else: else:
url_file = url_path[slash + 1:] url_file = url_path[slash + 1:]
urls.append(urlparse.urljoin(base, url_file)) urls.append(urlparse.urljoin(base, url_file))
urls.append(url) urls += url.split()
log.trace('_url: %s -> %s' % (','.join(urls), local)) log.trace('_url: %s -> %s' % (','.join(urls), local))
if not opts.dry_run():
for url in urls: for url in urls:
for dl in downloaders: for dl in downloaders:
if url.startswith(dl): if url.startswith(dl):
if downloaders[dl](url, local, config, opts): if downloaders[dl](url, local, config, opts):
return return
if not opts.dry_run():
raise error.general('downloading %s: all paths have failed, giving up' % (url)) raise error.general('downloading %s: all paths have failed, giving up' % (url))