Also delete files from the moves hash

mlschroe · mlschroe · commit f7d979e64ee8 · 2024-06-12T13:08:38.000+02:00
Fixes issue openSUSE#1010
diff --git a/mkbaselibs b/mkbaselibs
@@ -611,7 +611,10 @@ sub handle_rpms {
 	  }
 	}
       } elsif (substr($r, 0, 1) eq '-') {
-	delete $files{$_} for grep {/$rr/} keys %files;
+	for (grep {/$rr/} keys %files) {
+	  delete $files{$_};
+	  delete $moves{$_};
+	}
       } elsif (substr($r, 0, 1) eq '"') {
 	$rr =~ s/\"$//;
 	if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) {

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,10 @@ sub handle_rpms {`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`	`} elsif (substr($r, 0, 1) eq '-') {`
`614`		`- delete $files{$_} for grep {/$rr/} keys %files;`
	`614`	`+ for (grep {/$rr/} keys %files) {`
	`615`	`+ delete $files{$_};`
	`616`	`+ delete $moves{$_};`
	`617`	`+ }`
`615`	`618`	`} elsif (substr($r, 0, 1) eq '"') {`
`616`	`619`	`$rr =~ s/\"$//;`
`617`	`620`	`if ($rr =~ /^(.?)\s->\s(.?)$/) {`