summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2008-08-21 13:32:54 -0700
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 17:28:26 -0800
commite538e77a1afd4a537cb00b30fb1963f7f1c83f92 (patch)
treec61d2ccc58aff9da14810f9ec223e0d7b72da175
parentae8bdcf6572efa83fbe8a3a05b41808b0cfc5dae (diff)
filter the config list to exclude configs that no longer exist
avoid unnecessary sort/grep in the case where we already have a sorted list
-rwxr-xr-xdebian/local/pam-auth-update8
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update
index 3df71cc1..ad7b22f7 100755
--- a/debian/local/pam-auth-update
+++ b/debian/local/pam-auth-update
@@ -100,10 +100,12 @@ if (!@enabled) {
close(SEEN);
push(@enabled,
grep { $profiles{$_}->{'Default'} eq 'yes' && !$seen{$_} } @sorted);
+ # filter out any options that are no longer available for any reason
+ @enabled = grep { $profiles{$_} } @enabled;
+ @enabled = sort { $profiles{$b}->{'Priority'} <=> $profiles{$a}->{'Priority'} } @enabled;
+ my $prev = '';
+ @enabled = grep { $_ ne $prev && (($prev) = $_) } @enabled;
}
-@enabled = sort { $profiles{$b}->{'Priority'} <=> $profiles{$a}->{'Priority'} } @enabled;
-my $prev = '';
-@enabled = grep { $_ ne $prev && (($prev) = $_) } @enabled;
fset($template,'seen','false');
set($template,join(', ', @enabled));