diff options
author | Steve Langasek <vorlon@debian.org> | 2008-08-21 15:32:40 -0700 |
---|---|---|
committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 17:28:27 -0800 |
commit | c9108bfcc12006e4529895162926c101e33ac5b5 (patch) | |
tree | 2c4728124f0e6519abb9d5a7e13fd286df7dcfd5 /debian/local | |
parent | 443c526cb3fb9971e1a920477f5f9184c36e62df (diff) |
filter removals out of both the available and the enabled option lists
Diffstat (limited to 'debian/local')
-rwxr-xr-x | debian/local/pam-auth-update | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update index c830736d..2d590ff2 100755 --- a/debian/local/pam-auth-update +++ b/debian/local/pam-auth-update @@ -74,13 +74,13 @@ while ($#ARGV >= 0) { x_loadtemplatefile('/var/lib/dpkg/info/libpam-runtime.templates','libpam-runtime'); -# If we're being called for package removal, filter out those options here -@sorted = grep { !$removals{$_} } @sorted; - # always sort by priority, so we have consistency and don't have to # shuffle later @sorted = sort { $profiles{$b}->{'Priority'} <=> $profiles{$a}->{'Priority'} } keys(%profiles); +# If we're being called for package removal, filter out those options here +@sorted = grep { !$removals{$_} } @sorted; + subst($template, 'profile_names', join(', ',@sorted)); subst($template, 'profiles', join(', ', map { $profiles{$_}->{'Name'} } @sorted)); @@ -88,7 +88,7 @@ subst($template, 'profiles', my $diff = diff_profiles($confdir,$savedir); if ($diff) { - @enabled = @{$diff->{'mods'}}; + @enabled = grep { !$removals{$_} } @{$diff->{'mods'}}; } else { @enabled = split(/, /,get($template)); } |