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

Dependancies need string version support too.

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11491 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2009-08-04 22:10:18 +00:00
parent ce262fcaaf
commit a8f599ab2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modulemanager
View File

@ -185,7 +185,7 @@ sub resolve_deps {
my $ver = $todo{$mod}; my $ver = $todo{$mod};
my $info = $modules{$mod}{$ver} or die "no dependency information on $mod $ver"; my $info = $modules{$mod}{$ver} or die "no dependency information on $mod $ver";
for my $dep (@{$info->{depends}}) { for my $dep (@{$info->{depends}}) {
$dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}"; $dep =~ /^(\S+)(?: \S+))?/ or die "Bad dependency $dep from $info->{from}";
my($depmod, $depvers) = ($1,$2); my($depmod, $depvers) = ($1,$2);
next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers); next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
# need to install a dependency # need to install a dependency
@ -198,7 +198,7 @@ sub resolve_deps {
} }
} }
for my $dep (@{$info->{conflicts}}) { for my $dep (@{$info->{conflicts}}) {
$dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}"; $dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}";
my($depmod, $depvers) = ($1,$2); my($depmod, $depvers) = ($1,$2);
next unless $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers); next unless $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
# if there are changes this round, maybe the conflict won't come up after they are resolved. # if there are changes this round, maybe the conflict won't come up after they are resolved.