diff options
author | Chris Johns <chrisj@rtems.org> | 2013-04-22 22:28:27 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2013-04-22 22:28:27 +1000 |
commit | f077b2b19056694a3721ced3a7ee6b332c72a3ae (patch) | |
tree | 520d70f40e3ca2a9cf0d8bf7d3d70aef5f63cc9f /source-builder/sb/download.py | |
parent | Fix CVS downloads. (diff) | |
download | rtems-source-builder-f077b2b19056694a3721ced3a7ee6b332c72a3ae.tar.bz2 |
Fixes for CVS to work. Add RTEMS build for sparc/sis.
Diffstat (limited to 'source-builder/sb/download.py')
-rw-r--r-- | source-builder/sb/download.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index c34b0c0..feb57fe 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -77,8 +77,14 @@ def _cvs_parser(source, config, opts): except: raise error.general('invalid cvs path: %s' % (source['url'])) source['local'] = path.join(source['local_prefix'], 'cvs', source['file']) + for a in us[1:]: + _as = a.split('=') + if _as[0] == 'src-prefix': + if len(_as) != 2: + raise error.general('invalid cvs src-prefix: %s' % (a)) + source['src_prefix'] = _as[1] if 'src_prefix' in source: - source['symlink'] = path.join(source['local']) + source['symlink'] = path.join(source['local'], source['src_prefix']) else: source['symlink'] = source['local'] @@ -225,14 +231,14 @@ def _cvs_downloader(url, local, config, opts): date = _as[1] repo = cvs.repo(local, opts, config.macros, src_prefix) if not repo.valid(): - log.notice('cvs: checkout: %s -> %s' % (us[0], rlp)) if not path.isdir(local): log.notice('Creating source directory: %s' % \ (os.path.relpath(path.host(local)))) - log.output('making dir: %s' % (path.host(path.dirname(local)))) if not opts.dry_run(): path.mkdir(local) - repo.checkout(':%s' % (us[0][6:]), module, tag, date) + log.notice('cvs: checkout: %s -> %s' % (us[0], rlp)) + if not opts.dry_run(): + repo.checkout(':%s' % (us[0][6:]), module, tag, date) for a in us[1:]: _as = a.split('=') if _as[0] == 'update': |