--- loncom/build/CHECKRPMS 2006/10/03 00:34:59 1.1 +++ loncom/build/CHECKRPMS 2006/10/05 17:44:38 1.4 @@ -181,13 +181,20 @@ sub check_with_up2date { if (open (PIPE, "$up2date -l 2>&1 |")) { my @result=; close(PIPE); + my $output; + foreach my $line (@result) { + if ($line =~ /^The following Packages were marked to be skipped by your configuration:/) { + last; + } else { + $output .= $line; + } + } if (@result > 0) { - my $output = join('',@result); if ($output =~ /Fetching Obsoletes list/) { $up2date_error = 0; if ($output =~ /Name\s+Version\s+Rel\s+[\n\r\f]+\-+[\n\r\f]+(.+)/s) { my $packagelist = $1; - unless (($packagelist =~ /^The following Packages were marked to be skipped by your configuration:/) || ($packagelist eq '')) { + if ($packagelist ne '' && $packagelist !~ /^[\s\n\r\f]+$/) { open(TMPFILE,">>$tmpfile"); print TMPFILE $packagelist; close(TMPFILE); @@ -218,10 +225,19 @@ sub check_with_rug { chomp(@output); my @clean_output; foreach my $line (@output) { - if ($line eq 'Waking up ZMD...' || $line eq 'Done') { + if ($line =~ /^Waking\sup\sZMD\.\.\./) { next; - } - if ($line eq 'No updates are available.') { + } elsif ($line eq 'Done') { + next; + } elsif ($line eq '') { + next; + } elsif ($line eq 'The following packages will be installed:') { + next; + } elsif ($line eq 'Resolving Dependencies...') { + next; + } elsif ($line eq 'Transaction...') { + last; + } elsif ($line eq 'No updates are available.') { last; } else { push(@clean_output,$line);