summaryrefslogtreecommitdiff
path: root/modulemanager
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-08-04 22:10:18 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-08-04 22:10:18 +0000
commita8f599ab2d7ed5bbd684fcc651be070af0356855 (patch)
treea55d3a7deee92e0ca3f826f0be6f04566558e910 /modulemanager
parentce262fcaaf50e25d11b9f1cf89eb34747eeb6173 (diff)
Dependancies need string version support too.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11491 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'modulemanager')
-rwxr-xr-xmodulemanager4
1 files changed, 2 insertions, 2 deletions
diff --git a/modulemanager b/modulemanager
index 928e95152..f4fe55502 100755
--- a/modulemanager
+++ b/modulemanager
@@ -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+)(?: ([-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);
next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
# need to install a dependency
@@ -198,7 +198,7 @@ sub resolve_deps {
}
}
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);
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.