ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

modulemanger: check dependencies correctly

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11740 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-09-17 17:45:40 +00:00
parent 05b111d6a2
commit 4d91c60d55
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modulemanager
View File

@ -185,7 +185,7 @@ sub resolve_deps {
my $ver = $todo{$mod};
my $info = $modules{$mod}{$ver} or die "no dependency information on $mod $ver";
for my $dep (@{$info->{depends}}) {
$dep =~ /^(\S+)(?: \S+)?/ or die "Bad dependency $dep from $info->{from}";
$dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}";
my($depmod, $depvers) = ($1,$2);
next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
# need to install a dependency
@ -278,15 +278,11 @@ resolve_deps(0);
$| = 1; # immediate print of lines without \n
# whether or not to invoke ./configure -modupdate after processing
my $regen_modules_list = 0;
print "Processing changes for $action...\n";
for my $mod (keys %installed) {
next if $todo{$mod};
print "Uninstalling $mod $installed{$mod}\n";
unlink "src/modules/$mod.cpp";
$regen_modules_list = 1;
}
my $count = scalar keys %todo;
@ -312,7 +308,6 @@ for my $mod (sort keys %todo) {
} else {
print " - HTTP $stat\n";
}
$regen_modules_list = 1;
}
# write database of installed versions
@ -323,10 +318,4 @@ foreach my $key (keys %mod_versions)
}
close SRC;
# regenerate makefiles if necessary
if ($regen_modules_list)
{
print "Done... Re-generating makefiles\n";
system "./configure -modupdate";
}
print "Finished!\n";