← Back to branch summary

~mpontillo/maas/dns-template-changes-1.7

« back to all changes in this revision

Viewing changes to src/provisioningserver/import_images/download_descriptions.py

  • Committer: MaaS Lander
  • Author(s): Raphael Badin
  • Date: 2014-10-17 16:21:20 UTC
  • mfrom: (3263.2.1 revert-r-3263)
  • Revision ID: maas_lander-20141017162120-2f1sa7apve0uiryq
[r=andreserl][bug=][author=rvb] Revert revision 3263;  this change broke the CI: nodes cannot be commissioned (no-such-image error) with this change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/import_images/download_descriptions.py
78
78
        """Overridable from `BasicMirrorWriter`."""
79
79
        item = products_exdata(src, pedigree)
80
80
        os = get_os_from_product(item)
81
 
        arch, subarch = item['arch'], item['subarch']
 
81
        arch, subarches = item['arch'], item['subarches']
82
82
        release = item['release']
83
83
        label = item['label']
84
 
        base_image = ImageSpec(os, arch, subarch, release, label)
 
84
        base_image = ImageSpec(os, arch, None, release, label)
85
85
        compact_item = clean_up_repo_item(item)
86
 
        self.boot_images_dict.setdefault(base_image, compact_item)
 
86
        for subarch in subarches.split(','):
 
87
            self.boot_images_dict.setdefault(
 
88
                base_image._replace(subarch=subarch), compact_item)
87
89
 
88
90
 
89
91
def value_passes_filter_list(filter_list, property_value):