X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=modulemanager;h=0e978977abdc098d17f1b202c8af2e31ff450dba;hb=507e9554d69df3e2cee60fe52b02dc160c6e1602;hp=928e95152efbbf1bc08a17ba9cbed9137c2b82a5;hpb=ce262fcaaf50e25d11b9f1cf89eb34747eeb6173;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/modulemanager b/modulemanager
index 928e95152..0e978977a 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.
@@ -308,13 +308,14 @@ for my $mod (sort keys %todo) {
 	} else {
 		print " - HTTP $stat\n";
 	}
+}
 
-	# write database of installed versions
-	open SRC, '>.modulemanager' or die "can't write installed versions to .modulemanager, won't be able to track upgrades properly: $!";
-	foreach my $key (keys %mod_versions)
-	{
-		print SRC "$key $mod_versions{$key}\n";
-	}
-	close SRC;
+# write database of installed versions
+open SRC, '>.modulemanager' or die "can't write installed versions to .modulemanager, won't be able to track upgrades properly: $!";
+foreach my $key (keys %mod_versions)
+{
+	print SRC "$key $mod_versions{$key}\n";
 }
-print "Done!\n";
+close SRC;
+
+print "Finished!\n";