← Back to branch summary

~jtv/maas/bug-1302772

« back to all changes in this revision

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

  • Committer: MaaS Lander
  • Author(s): Raphael Badin
  • Date: 2014-03-19 08:33:48 UTC
  • mfrom: (2144.1.1 bug-import-eph-crash)
  • Revision ID: maas_lander-20140319083348-on4wi2q9fj4yw9g3
[r=julian-edwards][bug=1294516][author=rvb] Fix calls to install_image_from_simplestreams in the ephemerals import script: install_image_from_simplestreams() now takes a 'label' parameter.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/import_images/ephemerals_script.py
311
311
            # right now, although it might some day for HWE
312
312
            # kernels.
313
313
            install_image_from_simplestreams(
314
 
                target_dir, release=release, arch=arch,
 
314
                target_dir, release=release, label=label, arch=arch,
315
315
                temp_location=self._simplestreams_path())
316
316
            if arch == 'armhf':
317
317
                install_image_from_simplestreams(
318
 
                    target_dir, release=release, arch=arch, subarch='highbank',
 
318
                    target_dir, release=release, label=label, arch=arch,
 
319
                    subarch='highbank',
319
320
                    temp_location=self._simplestreams_path())
320
321
 
321
322
            tgt_conf_path = os.path.join(target_dir, 'tgt.conf')