From 55eaf1c8304888140fa89441be63fb738fc7fd81 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 18 May 2012 12:44:06 +0200 Subject: [PATCH] only create a mirrorlist if mirmon is installed and configured --- gen_website | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gen_website b/gen_website index ae21d86..a5933e5 100755 --- a/gen_website +++ b/gen_website @@ -11,17 +11,28 @@ use File::Copy::Recursive qw(fcopy dirmove); use File::Temp qw (tempdir); use lib '/usr/share/perl5/'; -use Mirmon::Mirmon; -my $m = Mirmon ->new('/etc/mirmon.conf'); -my $conf = $m->conf ; # a Mirmon::Conf object -my $state = $m->state ; # the mirmon state +my $have_mirmon = 0; +my $masterlist = '/usr/local/src/grml-mirrors/Mirrors.masterlist'; +my $mirmonconf = '/etc/mirmon.conf'; + +my $fh; +my $m; +my $conf; +my $state; +if (eval {use Mirmon::Mirmon; 1 } && -f $masterlist && -f $mirmonconf) { + $have_mirmon = 1; + open ($fh, '<', $masterlist) or die "Could not open $masterlist: $!"; + $m = Mirmon ->new($mirmonconf); + $conf = $m->conf ; # a Mirmon::Conf object + $state = $m->state ; # the mirmon state +} else { + print "Skipping mirmon, it's either not installed or not configured.\n"; +} my $out_dir = shift || "out/"; -my $masterlist = '/usr/local/src/grml-mirrors/Mirrors.masterlist'; -open (my $fh, '<', $masterlist) or die "Could not open $masterlist: $!"; my $mirrors; sub get_last_state ($) { @@ -34,7 +45,7 @@ sub get_last_state ($) { my $data; -while (my $line = <$fh>) { +while (($have_mirmon) && (my $line = <$fh>)) { chomp $line; if ($line =~ /([^:]+): (.*)/) { my $key = lc($1); -- 2.1.4