From 5ea1590437c74e4a46a24286a609fc3c49f49a03 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 30 Mar 2017 17:08:43 -0400 Subject: [PATCH] Update dep_order to throw out banned/core modules early so we dont try to resolve circular deps that snuck in --- banned.lst | 136 +++++++++++++++++++++++++++++++++++++++++++++ dumpstor.pl | 12 +++- lib/TestCpanInc.pm | 14 ++++- 3 files changed, 159 insertions(+), 3 deletions(-) diff --git a/banned.lst b/banned.lst index 9ac1238..e3f6489 100644 --- a/banned.lst +++ b/banned.lst @@ -6,3 +6,139 @@ CPAN::Test::Dummy::Perl5::Make::CircDepeOne CPAN::Test::Dummy::Perl5::Make::CircDepeThree CPAN::Test::Dummy::Perl5::Make::CircDepeTwo OurNet::BBSAgent +OurNet::Template +OurNet::BBS +OurNet::BBS::Authen +OurNet::BBS::Base +OurNet::BBS::BBSAgent::Article +OurNet::BBS::BBSAgent::ArticleGroup +OurNet::BBS::BBSAgent::BBS +OurNet::BBS::BBSAgent::Board +OurNet::BBS::BBSAgent::BoardGroup +OurNet::BBS::Client +OurNet::BBS::Cola::Article +OurNet::BBS::Cola::ArticleGroup +OurNet::BBS::Cola::BBS +OurNet::BBS::Cola::Board +OurNet::BBS::Cola::BoardGroup +OurNet::BBS::Cola::FileGroup +OurNet::BBS::Cola::User +OurNet::BBS::Cola::UserGroup +OurNet::BBS::CVIC::Article +OurNet::BBS::CVIC::ArticleGroup +OurNet::BBS::CVIC::BBS +OurNet::BBS::CVIC::Board +OurNet::BBS::CVIC::BoardGroup +OurNet::BBS::CVIC::FileGroup +OurNet::BBS::CVIC::Group +OurNet::BBS::CVIC::GroupGroup +OurNet::BBS::CVIC::Session +OurNet::BBS::CVIC::SessionGroup +OurNet::BBS::CVIC::User +OurNet::BBS::CVIC::UserGroup +OurNet::BBS::External::ArticleGroup +OurNet::BBS::External::BBS +OurNet::BBS::External::Board +OurNet::BBS::External::BoardGroup +OurNet::BBS::Firebird3::Article +OurNet::BBS::Firebird3::ArticleGroup +OurNet::BBS::Firebird3::BBS +OurNet::BBS::Firebird3::Board +OurNet::BBS::Firebird3::BoardGroup +OurNet::BBS::Firebird3::FileGroup +OurNet::BBS::Firebird3::User +OurNet::BBS::Firebird3::UserGroup +OurNet::BBS::MailBox::Article +OurNet::BBS::MailBox::ArticleGroup +OurNet::BBS::MailBox::BBS +OurNet::BBS::MailBox::Board +OurNet::BBS::MailBox::BoardGroup +OurNet::BBS::MAPLE2::Article +OurNet::BBS::MAPLE2::ArticleGroup +OurNet::BBS::MAPLE2::BBS +OurNet::BBS::MAPLE2::Board +OurNet::BBS::MAPLE2::BoardGroup +OurNet::BBS::MAPLE2::FileGroup +OurNet::BBS::MAPLE2::GroupGroup +OurNet::BBS::MAPLE2::Session +OurNet::BBS::MAPLE2::SessionGroup +OurNet::BBS::MAPLE2::User +OurNet::BBS::MAPLE2::UserGroup +OurNet::BBS::MAPLE3::Article +OurNet::BBS::MAPLE3::ArticleGroup +OurNet::BBS::MAPLE3::BBS +OurNet::BBS::MAPLE3::Board +OurNet::BBS::MAPLE3::BoardGroup +OurNet::BBS::MAPLE3::FileGroup +OurNet::BBS::MAPLE3::GroupGroup +OurNet::BBS::MAPLE3::SessionGroup +OurNet::BBS::MAPLE3::User +OurNet::BBS::MAPLE3::UserGroup +OurNet::BBS::MELIX::Article +OurNet::BBS::MELIX::ArticleGroup +OurNet::BBS::MELIX::BBS +OurNet::BBS::MELIX::Board +OurNet::BBS::MELIX::BoardGroup +OurNet::BBS::MELIX::FileGroup +OurNet::BBS::MELIX::Group +OurNet::BBS::MELIX::GroupGroup +OurNet::BBS::MELIX::Session +OurNet::BBS::MELIX::SessionGroup +OurNet::BBS::MELIX::User +OurNet::BBS::MELIX::UserGroup +OurNet::BBS::NNTP::Article +OurNet::BBS::NNTP::ArticleGroup +OurNet::BBS::NNTP::BBS +OurNet::BBS::NNTP::Board +OurNet::BBS::NNTP::BoardGroup +OurNet::BBS::OurNet::BBS +OurNet::BBS::PTT::Article +OurNet::BBS::PTT::ArticleGroup +OurNet::BBS::PTT::BBS +OurNet::BBS::PTT::Board +OurNet::BBS::PTT::BoardGroup +OurNet::BBS::PTT::FileGroup +OurNet::BBS::PTT::SessionGroup +OurNet::BBS::PTT::User +OurNet::BBS::PTT::UserGroup +OurNet::BBS::RAM::Article +OurNet::BBS::RAM::ArticleGroup +OurNet::BBS::RAM::BBS +OurNet::BBS::RAM::Board +OurNet::BBS::RAM::BoardGroup +OurNet::BBS::RAM::Group +OurNet::BBS::RAM::GroupGroup +OurNet::BBS::RAM::Session +OurNet::BBS::RAM::SessionGroup +OurNet::BBS::RAM::User +OurNet::BBS::RAM::UserGroup +OurNet::BBS::ScalarFile +OurNet::BBS::Server +OurNet::BBS::ShmArray +OurNet::BBS::ShmScalar +OurNet::BBS::SocketScalar +OurNet::BBS::Utils +OurNet::BBSAgent +OurNet::BBSApp +OurNet::BBSApp::Arena +OurNet::BBSApp::Board +OurNet::BBSApp::CmdPerm +OurNet::BBSApp::Consensus +OurNet::BBSApp::Issue +OurNet::BBSApp::MailList +OurNet::BBSApp::Monitor +OurNet::BBSApp::Proposal +OurNet::BBSApp::Schedule +OurNet::BBSApp::Sync +OurNet::BBSApp::Templator +OurNet::ChatBot +OurNet::Extract +OurNet::FuzzyIndex +OurNet::Generate +OurNet::Query +OurNet::Site +OurNet::Template +OurNet::Template::Extract +OurNet::Template::Generate +OurNet::WebBuilder +Slash::OurNet::Standalone diff --git a/dumpstor.pl b/dumpstor.pl index 95eda02..7c268b5 100755 --- a/dumpstor.pl +++ b/dumpstor.pl @@ -1,7 +1,17 @@ #!/usr/bin/env perl +use 5.24.0; + use Data::Dumper; use Storable; #$Data::Dumper::Terse = 1; -print Dumper(retrieve $ARGV[0]); +my $cache = retrive $ARGV[0]; + +for my $key (keys $cache->%*) { + if ($key =~ /OurNet/) { + delete $cache->{$key}; + } +} + +print Dumper([keys ((retrieve $ARGV[0])->%*)]); diff --git a/lib/TestCpanInc.pm b/lib/TestCpanInc.pm index 3aafd14..b37ebc5 100644 --- a/lib/TestCpanInc.pm +++ b/lib/TestCpanInc.pm @@ -7,6 +7,7 @@ use warnings; use Data::Dumper; use List::Util qw/uniq/; use IPC::Run qw/run/; +use Module; our $perlbrew_env = 'blead'; @@ -20,14 +21,23 @@ sub remove_imc { run \@cmd, '>&', \$out; } +our $last_dep = time(); + sub dep_order { my $module = shift; + my $level = shift || 0; my @orders; for my $dep ($module->depends->@*) { -# print "\r", $dep->name, " "; - push @orders, dep_order($dep); + + if ($level >= 200) { + print $dep->name, "\n"; + $last_dep = time(); + } + + next if (Module::_is_banned($dep->name)); + push @orders, dep_order($dep, $level+1); } push @orders, $module;