diff options
Diffstat (limited to 't_install_iso/016_check_pubkey.t')
| -rw-r--r-- | t_install_iso/016_check_pubkey.t | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/t_install_iso/016_check_pubkey.t b/t_install_iso/016_check_pubkey.t index d65e2bc..05eed86 100644 --- a/t_install_iso/016_check_pubkey.t +++ b/t_install_iso/016_check_pubkey.t @@ -39,24 +39,22 @@ my $media; system "ls /media/iso_check/i586/media/ > temp_media_on_iso.log" if -r "/media/iso_check/i586/media/"; system "ls /media/iso_check/x86_64/media/ >> temp_media_on_iso.log" if -r "/media/iso_check/x86_64/media/"; -ok -r "temp_media_on_iso.log", "Got a log for media contents"; +ok(-r "temp_media_on_iso.log", "Got a log for media contents"); -open(my $file, "temp_media_on_iso.log") if -r "temp_media_on_iso.log"; - -while ($media = <$file>) { - chomp($media); - if ($info{arch} ne "dual" && $media ne 'media_info') { - $path = "/media/iso_check/" . $info{arch} . "/media/$media/media_info/pubkey"; - $url = "pubkey/" . $info{arch} . "-$media-pubkey"; +foreach (cat_("temp_media_on_iso.log")) { + chomp; + if ($info{arch} ne "dual" && $_ ne 'media_info') { + $path = "/media/iso_check/" . $info{arch} . "/media/$_/media_info/pubkey"; + $url = "pubkey/" . $info{arch} . "-$_-pubkey"; #$url .= "-cooker" if !$finale; - $pubkey &= check_key($path, $url, $media, $info{arch}) if -r $path && -r $url; + $pubkey &= check_key($path, $url, $_, $info{arch}) if -r $path && -r $url; } - elsif ($media ne 'media_info') { + elsif ($_ ne 'media_info') { foreach my $arch ("i586", "x86_64") { - $path = "/media/iso_check/$arch/media/$media/media_info/pubkey"; - $url = "pubkey/$arch-$media-pubkey"; + $path = "/media/iso_check/$arch/media/$_/media_info/pubkey"; + $url = "pubkey/$arch-$_-pubkey"; #$url .= "-cooker" if !$finale; - -r $path and -r $url and $pubkey &= check_key($path, $url, $media, $arch); + -r $path and -r $url and $pubkey &= check_key($path, $url, $_, $arch); } } } |