diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 17:35:31 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 20:39:00 +0000 |
commit | 8604d137143ed3dfd2abecb718a32c31bb0dac48 (patch) | |
tree | d2a84be7e4044de0800ab245c322ebfe1f0c5fc3 /lib/MGA/DrakISO/BuildClassic.pm | |
parent | 8152efd28ce168ddedf8031c07b8bd7418c9526e (diff) | |
download | drakiso-8604d137143ed3dfd2abecb718a32c31bb0dac48.tar drakiso-8604d137143ed3dfd2abecb718a32c31bb0dac48.tar.gz drakiso-8604d137143ed3dfd2abecb718a32c31bb0dac48.tar.bz2 drakiso-8604d137143ed3dfd2abecb718a32c31bb0dac48.tar.xz drakiso-8604d137143ed3dfd2abecb718a32c31bb0dac48.zip |
Move handling of copy_from_repo list to prepare_iso_bootloader().
This allows it to be used for Live ISOs too.
Diffstat (limited to 'lib/MGA/DrakISO/BuildClassic.pm')
-rwxr-xr-x | lib/MGA/DrakISO/BuildClassic.pm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/MGA/DrakISO/BuildClassic.pm b/lib/MGA/DrakISO/BuildClassic.pm index 21c9cb2..503b044 100755 --- a/lib/MGA/DrakISO/BuildClassic.pm +++ b/lib/MGA/DrakISO/BuildClassic.pm @@ -103,19 +103,10 @@ sub prepare_files { my $version = $build->{settings}{version}; my $tag = $build->{settings}{tag}; - # Process the list of files or directories supplied by the user. If the - # repository is on a local disk, we just create soft links, otherwise - # we have to download the files. - my $repo_dir = $build->{settings}{repository} . '/' . $arch . '/'; - my $copy_dir = $build->get_builddir . '/'; - foreach (group_by2(@{$build->{copy_from_repo}})) { - my ($src, $dst) = @$_; - copy_or_link($repo_dir . $src, $copy_dir . $dst); - } + my $files_dir = $build->get_builddir('files') . '/'; - # Automatically generate the remaining files. - create_product_id($build, $copy_dir . $arch . '/product.id'); - create_index($build, $copy_dir . $arch . '/pkg-' . $version . '-' . $tag . '.idx'); + create_product_id($build, $files_dir . $arch . '/product.id'); + create_index($build, $files_dir . $arch . '/pkg-' . $version . '-' . $tag . '.idx'); } ############################################################################### |