565 def merge_binaries(self, binaries_reader): |
565 def merge_binaries(self, binaries_reader): |
566 """ Merge binaries based on build log and system definition. """ |
566 """ Merge binaries based on build log and system definition. """ |
567 for (unit_name, binaries) in binaries_reader: |
567 for (unit_name, binaries) in binaries_reader: |
568 unit_name = unit_name.lower() |
568 unit_name = unit_name.lower() |
569 if self.units.has_key(unit_name): |
569 if self.units.has_key(unit_name): |
570 for bin in binaries: |
570 for bin_ in binaries: |
571 #if bin.find('_stolon_ekern') != -1: |
571 #if bin_.find('_stolon_ekern') != -1: |
572 _logger.debug("Merging: %s" % bin) |
572 _logger.debug("Merging: %s" % bin_) |
573 unit = self.units[unit_name] |
573 unit = self.units[unit_name] |
574 unit.binaries = [Binary(bin.lower(), self) for bin in binaries] |
574 unit.binaries = [Binary(bin_.lower(), self) for bin_ in binaries] |
575 for binary in unit.binaries: |
575 for binary in unit.binaries: |
576 self.addElement(binary) |
576 self.addElement(binary) |
577 _logger.info('Merging binary: %s' % str(binary)) |
577 _logger.info('Merging binary: %s' % str(binary)) |
578 else: |
578 else: |
579 _logger.warning('Component found in the build log but not in sysdef: %s' % unit_name) |
579 _logger.warning('Component found in the build log but not in sysdef: %s' % unit_name) |