diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-01 21:14:46 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-01 21:14:46 +0100 |
| commit | 76abcd91020a70f9b90a0b0748b0128efaebddf9 (patch) | |
| tree | 825d7024611273d467ab3f15ab609a25a1aeedde /lib/MGA/DrakISO/BuildISO.pm | |
| parent | ee01aca88ae9db68ef97360ba5cad10e5a1e5141 (diff) | |
| download | drakiso-76abcd91020a70f9b90a0b0748b0128efaebddf9.tar drakiso-76abcd91020a70f9b90a0b0748b0128efaebddf9.tar.gz drakiso-76abcd91020a70f9b90a0b0748b0128efaebddf9.tar.bz2 drakiso-76abcd91020a70f9b90a0b0748b0128efaebddf9.tar.xz drakiso-76abcd91020a70f9b90a0b0748b0128efaebddf9.zip | |
Fix some perl -cw and perl_checker warnings.
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
| -rw-r--r-- | lib/MGA/DrakISO/BuildISO.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index f4278b1..09096a7 100644 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -26,7 +26,6 @@ package MGA::DrakISO::BuildISO; use strict; use MDK::Common; -use common; use MGA::DrakISO::ISOBuild; use MGA::DrakISO::Loopback; @@ -46,7 +45,7 @@ our @EXPORT = qw(build_iso); sub build_iso { my ($build) = @_; - my $efi_type = $build->{media}{efi_type} // 'none'; + my $efi_type = $build->{media}{efi_type} || 'none'; my $loopbacks = $build->get_build_dir('loopbacks'); my $files = $build->get_build_dir('files'); @@ -99,11 +98,9 @@ sub list_selected_loopbacks { sub build_iso_image { my ($build, @opts) = @_; - my $arch = $build->{settings}{arch}; + my $efi_type = $build->{media}{efi_type} || 'none'; - my $efi_type = $build->{media}{efi_type} // 'none'; - - my $mbr_image = $build->get_absolute_path($build->{media}{mbr_boot_img}) // '/usr/lib/grub/i386-pc/boot_hybrid.img'; + my $mbr_image = $build->get_absolute_path($build->{media}{mbr_boot_img}) || '/usr/lib/grub/i386-pc/boot_hybrid.img'; -e $mbr_image or die "ERROR: cannot find MBR boot image $mbr_image\n"; my $esp_image = $build->get_build_dir('images') . '/esp.img'; |