yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repo-checker.pl: drop old debug lines.

Browse Source
This commit is contained in:
Jimmy Berry 2017-07-28 16:41:15 -05:00
parent 8c9f330a67
commit 53fc904f78
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repo-checker.pl
View File

@ -1,6 +1,5 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
use File::Basename; use File::Basename;
use File::Temp qw/ tempdir /; use File::Temp qw/ tempdir /;
use XML::Simple; use XML::Simple;
@ -90,18 +89,14 @@ foreach my $package (@rpms) {
close(PACKAGES); close(PACKAGES);
#print STDERR "calling installcheck\n";
#print STDERR Dumper(\%targets);
my $error_file = $tmpdir . "/error_file"; my $error_file = $tmpdir . "/error_file";
open(INSTALL, "/usr/bin/installcheck $arch $pfile 2> $error_file |") open(INSTALL, "/usr/bin/installcheck $arch $pfile 2> $error_file |")
|| die 'exec installcheck'; || die 'exec installcheck';
while (<INSTALL>) { while (<INSTALL>) {
chomp; chomp;
# print STDERR "$_\n";
next if (m/unknown line:.*Flx/); next if (m/unknown line:.*Flx/);
if ( $_ =~ m/can't install (.*)-([^-]+)-[^-\.]/ ) { if ( $_ =~ m/can't install (.*)-([^-]+)-[^-\.]/ ) {
# print STDERR "CI $1 " . $targets{$1} . "\n";
if ( defined $targets{$1} ) { if ( defined $targets{$1} ) {
print "$_\n"; print "$_\n";
while (<INSTALL>) { while (<INSTALL>) {
@ -123,18 +118,15 @@ while (<ERROR>) {
} }
close(ERROR); close(ERROR);
#print STDERR "checking file conflicts\n";
my $cmd = sprintf( "perl %s/findfileconflicts $pfile", dirname($0) ); my $cmd = sprintf( "perl %s/findfileconflicts $pfile", dirname($0) );
open(INSTALL, "$cmd 2> $error_file |") || die 'exec fileconflicts'; open(INSTALL, "$cmd 2> $error_file |") || die 'exec fileconflicts';
my $inc = 0; my $inc = 0;
while (<INSTALL>) { while (<INSTALL>) {
chomp; chomp;
# print STDERR "$_\n";
if ( $_ =~ m/found conflict of (.*)-[^-]+-[^-]+ with (.*)-[^-]+-[^-]+:/ ) { if ( $_ =~ m/found conflict of (.*)-[^-]+-[^-]+ with (.*)-[^-]+-[^-]+:/ ) {
$inc = 0; $inc = 0;
# print STDERR "F $1 $2 -$targets{$1}-$targets{$2}-\n";
if ( defined $targets{$1} || defined $targets{$2} ) { if ( defined $targets{$1} || defined $targets{$2} ) {
$inc = 1; $inc = 1;
$ret = 1; $ret = 1;
@ -154,5 +146,4 @@ while (<ERROR>) {
} }
close(ERROR); close(ERROR);
#print STDERR "RET $ret\n";
exit($ret); exit($ret);