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 sources related bugs.

Browse Source 
Updates the sources module introduced bugs in the build and download
modules. The commit fixes those modules.
This commit is contained in:
Chris Johns 2014-08-12 12:59:22 +10:00
parent 8db5212665
commit d3629a9bae
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source-builder/sb/build.py
View File

@ -160,7 +160,7 @@ class build:
# these may be overridden by user loaded macros. # these may be overridden by user loaded macros.
# #
_map = 'source-%s' % (name) _map = 'source-%s' % (name)
src_keys = self.macros.map_keys(_map) src_keys = [s for s in self.macros.map_keys(_map) if s != 'setup']
if len(src_keys) == 0: if len(src_keys) == 0:
raise error.general('no source set: %s (%s)' % (name, _map)) raise error.general('no source set: %s (%s)' % (name, _map))
srcs = [] srcs = []
@ -247,7 +247,7 @@ class build:
args = args[2:] args = args[2:]
_map = 'patch-%s' % (name) _map = 'patch-%s' % (name)
default_opts = ' '.join(args) default_opts = ' '.join(args)
patch_keys = self.macros.map_keys(_map) patch_keys = [p for p in self.macros.map_keys(_map) if p != 'setup']
patches = [] patches = []
for p in patch_keys: for p in patch_keys:
pm = self.macros.get(p, globals = False, maps = _map) pm = self.macros.get(p, globals = False, maps = _map)

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

@ -34,6 +34,7 @@ import error
import git import git
import log import log
import path import path
import sources
def _humanize_bytes(bytes, precision = 1): def _humanize_bytes(bytes, precision = 1):
abbrevs = ( abbrevs = (