X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=modulemanager;h=4d9cba45694a2057fc9ce725b5d00cb1b28bcebb;hb=77b7c4300472ff1ba5c643b75ead4be75625f96f;hp=18a169f9be72922ea70e09c973daae1a5326016d;hpb=5217069a0e1e10211f7fd1f34a2548dc3f2c44e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/modulemanager b/modulemanager
index 18a169f9b..4d9cba456 100755
--- a/modulemanager
+++ b/modulemanager
@@ -137,6 +137,7 @@ sub find_mod_in_range {
 }
 
 sub resolve_deps {
+	my($trial) = @_;
 	my $tries = 100;
 	my $changes = 'INIT';
 	my $fail = undef;
@@ -166,10 +167,13 @@ sub resolve_deps {
 				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.
-				$fail ||= "Cannot install: module $mod ($ver) conflicts with versions $depmod version $todo{depmod}";
+				$fail ||= "Cannot install: module $mod ($ver) conflicts with $depmod version $todo{$depmod}";
 			}
 		}
 	}
+	if ($trial) {
+		return !($changes || $fail);
+	}
 	if ($changes) {
 		print "Infinite dependency loop:$changes\n";
 		exit 1;
@@ -198,15 +202,20 @@ if ($action eq 'install') {
 		$todo{$mod} = $ver;
 	}
 } elsif ($action eq 'upgrade') {
-	for my $mod (keys %installed) {
+	my @installed = sort keys %installed;
+	for my $mod (@installed) {
 		next unless $mod =~ /^m_/;
+		my %saved = %todo;
 		$todo{$mod} = find_mod_in_range($mod);
+		if (!resolve_deps(1)) {
+			%todo = %saved;
+		}
 	}
 } else {
 	die "Unknown action $action"
 }
 
-resolve_deps();
+resolve_deps(0);
 
 $| = 1; # immediate print of lines without \n