jmq/Documentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prt-auf: cleaned up the detection of locked ports in sysup()

Browse Source
This commit is contained in:
John McQuah 2022-06-20 09:53:20 -04:00
parent 82c2bd8769
commit 35b6c4e4f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/prt-auf
View File

@ -658,12 +658,11 @@ sub up_inst { # returns scalar references to five arrays
# filter out the invalid ports if deporder() didn't do so already # filter out the invalid ports if deporder() didn't do so already
@targets = grep { ($V_REPO{$_}) } @targets if ($type eq "grpinst"); @targets = grep { ($V_REPO{$_}) } @targets if ($type eq "grpinst");
# exempt any locked ports from an sysup operation # exempt any locked ports from an update operation
%EXEMPT = map { $_ => 0 } @LOCKED; %EXEMPT = map { $_ => 1 } @LOCKED;
%WANTED = map { $_ => 1 } @requested; %WANTED = map { $_ => 1 } @requested;
if ($action eq "sysup") { @targets = grep {! $EXEMPT{$_}} @targets; if ($action =~ /^(update|install|depinst)$/) {
} else { @targets = grep {(! $EXEMPT{$_}) or ($WANTED{$_})} @targets;
@targets = grep {(! $EXEMPT{$_}) or ($WANTED{$_})} @targets;
} }
# first determine the directories from which pkgmk must be called, # first determine the directories from which pkgmk must be called,
@ -735,6 +734,7 @@ sub up_inst { # returns scalar references to five arrays
sub sysup { sub sysup {
my @targets; my $v_repo; my @targets; my $v_repo;
foreach my $p (keys %V_INST) { foreach my $p (keys %V_INST) {
next if grep /$p/, @LOCKED;
$v_repo = ($V_REPO{$p}) ? $V_REPO{$p} : "MISSING" ; $v_repo = ($V_REPO{$p}) ? $V_REPO{$p} : "MISSING" ;
push @targets, $p if (($v_repo ne $V_INST{$p}) and ($v_repo ne "MISSING")); push @targets, $p if (($v_repo ne $V_INST{$p}) and ($v_repo ne "MISSING"));
} }