From 532b679a4d74e5067367963d069898a82676dccf Mon Sep 17 00:00:00 2001
From: Valko Laszlo <valko@linux.karinthy.hu>
Date: Sat, 23 Jan 2021 03:31:17 +0100
Subject: [PATCH] Fixed restart question for .cab patch installations. Gave
 version matching the option to depend on package name as well.

---
 pkgtool.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgtool.pm b/pkgtool.pm
index 776da74..6062b6e 100644
--- a/pkgtool.pm
+++ b/pkgtool.pm
@@ -1400,7 +1400,7 @@ sub match_package_version ($$$$)
 	my $matchvercond = $$def{'match-version-condition'};
 	my $matchversion = $$def{'match-version'};
 	if (defined $matchvercond) {
-		my ($value, $error) = evaluate_expression('global', $vars, { version => $instver }, $matchvercond);
+		my ($value, $error) = evaluate_expression('global', $vars, { version => $instver, name => $$inst{Name} }, $matchvercond);
 
 		if (defined $error && $error ne '') {
 			print_log('global', WARNING, 'Evaluating version match condition expression %s failed: %s',
@@ -3016,7 +3016,7 @@ sub install_patch ($$$$$$$)
 	}
 	elsif ($style eq 'cab') {
 		my $exename = substitute_variables($vars, '%systemroot%/System32/dism.exe', 1, undef, 'pkg');
-		my $paramlist = ['/online', '/add-package', '/packagepath:'.$sourcefile];
+		my $paramlist = ['/online', '/add-package', '/packagepath:'.$sourcefile, '/norestart'];
 		push @$paramlist, @{$$patchdef{parameters}} if defined $$patchdef{parameters};
 		if (-f $sourcefile) {
 			($error, $exitcode) = run_exe('pkg', $db, $vars, undef, $exename, $paramlist, 0);