[ostree-installer] Put images to os/ directory
Instead of putting everything to <variant>/<arch>/iso, move images/, EFI/ and isolinux/ subdirs to <variant>/<arch>/os. The nicely named ISO image is still in the original location. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
5698a9727e
commit
022a4d36f5
@ -91,10 +91,11 @@ class OstreeInstallerThread(WorkerThread):
|
||||
|
||||
def _copy_image(self, compose, variant, arch, filename, output_dir):
|
||||
iso_path = compose.paths.compose.iso_path(arch, variant, filename)
|
||||
os_path = compose.paths.compose.os_tree(arch, variant)
|
||||
boot_iso = os.path.join(output_dir, 'images', 'boot.iso')
|
||||
|
||||
shortcuts.run('cp -av %s/* %s/' %
|
||||
(pipes.quote(output_dir), pipes.quote(os.path.dirname(iso_path))))
|
||||
(pipes.quote(output_dir), pipes.quote(os_path)))
|
||||
try:
|
||||
os.link(boot_iso, iso_path)
|
||||
except OSError:
|
||||
|
@ -160,7 +160,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
|
||||
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/'))
|
||||
self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
|
||||
self.assertEqual(run.call_args_list,
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/iso/'.format(self.topdir))])
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/os/'.format(self.topdir))])
|
||||
|
||||
@mock.patch('kobo.shortcuts.run')
|
||||
@mock.patch('productmd.images.Image')
|
||||
@ -223,7 +223,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
|
||||
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/'))
|
||||
self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
|
||||
self.assertEqual(run.call_args_list,
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/iso/'.format(self.topdir))])
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/os/'.format(self.topdir))])
|
||||
|
||||
@mock.patch('kobo.shortcuts.run')
|
||||
@mock.patch('productmd.images.Image')
|
||||
@ -337,7 +337,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
|
||||
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/'))
|
||||
self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
|
||||
self.assertEqual(run.call_args_list,
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/iso/'.format(self.topdir))])
|
||||
[mock.call('cp -av {0}/work/x86_64/Everything/ostree_installer/* {0}/compose/Everything/x86_64/os/'.format(self.topdir))])
|
||||
|
||||
@mock.patch('kobo.shortcuts.run')
|
||||
@mock.patch('productmd.images.Image')
|
||||
|
Loading…
Reference in New Issue
Block a user