diff options
author | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
commit | b0f9e30fa46a8025b76bf86321ebe585de8972f4 (patch) | |
tree | 6d41e695fa3fde9c57df29696f2e5874a064116a /source-builder/sb/download.py | |
parent | Add gdb-7.8.2 hash. (diff) | |
download | rtems-source-builder-b0f9e30fa46a8025b76bf86321ebe585de8972f4.tar.bz2 |
Add merge to the git and download modules to merge after a fetch.
Update the RTEMS tools and newlib-git to merge after the fetch.
Diffstat (limited to 'source-builder/sb/download.py')
-rw-r--r-- | source-builder/sb/download.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 17d1d7e..16aa251 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -423,10 +423,6 @@ def _git_downloader(url, local, config, opts): log.notice('git: checkout: %s => %s' % (us[0], _as[1])) if _do_download(opts): repo.checkout(_as[1]) - elif _as[0] == 'pull': - log.notice('git: pull: %s' % (us[0])) - if _do_download(opts): - repo.pull() elif _as[0] == 'submodule': if len(_as) != 2: raise error.general('invalid git submodule: %s' % (_as)) @@ -437,6 +433,14 @@ def _git_downloader(url, local, config, opts): log.notice('git: fetch: %s -> %s' % (us[0], rlp)) if _do_download(opts): repo.fetch() + elif _as[0] == 'merge': + log.notice('git: merge: %s' % (us[0])) + if _do_download(opts): + repo.merge() + elif _as[0] == 'pull': + log.notice('git: pull: %s' % (us[0])) + if _do_download(opts): + repo.pull() elif _as[0] == 'reset': arg = [] if len(_as) > 1: |