From 2c8b572819fd2c01bc016478275c0b954c340e6f Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 13 Sep 2018 15:53:19 +0000 Subject: [PATCH] scrape stupid debug code --- infrastructure/bin/pkg_check-problems | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/infrastructure/bin/pkg_check-problems b/infrastructure/bin/pkg_check-problems index dfb64d796eb..934936275c0 100644 --- a/infrastructure/bin/pkg_check-problems +++ b/infrastructure/bin/pkg_check-problems @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $OpenBSD: pkg_check-problems,v 1.8 2018/09/12 15:34:31 espie Exp $ +# $OpenBSD: pkg_check-problems,v 1.9 2018/09/13 15:53:19 espie Exp $ # Copyright (c) 2004, 2010 Marc Espie # # Permission to use, copy, modify, and distribute this software for any @@ -432,8 +432,9 @@ sub compute_conflicts my $newkey = join(',', sort map { $self->fullname($_) } @$result); if (@$result == 1) { - $newkey.="-> was ".join(',', @$l); + $newkey .= "-> was ".join(',', @$l); } + print STDERR $newkey, " ", $key, "\n"; push(@{$r->{$newkey}}, $key); } } @@ -441,6 +442,17 @@ sub compute_conflicts return $r; } +sub show_conflicts +{ + my ($self, $result) = @_; + for my $cfl (sort keys %$result) { + $self->say("#1", $cfl); + for my $f (sort @{$result->{$cfl}}) { + $self->say("\t#1", $f); + } + } +} + sub check_license { my ($self, $pkg, $k) = @_; @@ -473,7 +485,6 @@ sub check_licenses for my $k (qw(cdrom_okay ftp_okay)) { while (my ($pkg, $v) = each %{$self->{$k}}) { next if $v == 0; - print $pkg, "\n"; my $d = $self->check_license($pkg, $k); if (defined $d) { $r->{$k}{$pkg} = $d; @@ -495,17 +506,6 @@ sub show_licenses_issues } } -sub show_conflicts -{ - my ($self, $result) = @_; - for my $cfl (sort keys %$result) { - $self->say("#1", $cfl); - for my $f (sort @{$result->{$cfl}}) { - $self->say("\t#1", $f); - } - } -} - sub display_results { my $self = shift;