[apparmor] [Branch ~apparmor-dev/apparmor/master] Rev 2136: Kshitij Gupta found and fixed a problem with Glob and Glob w/ Ext behavior

[Christian Boltz]

Hello,

Am Freitag, 5. Juli 2013 schrieb noreply at launchpad.net:
> revno: 2136
> committer: Seth Arnold <seth.arnold at canonical.com>

>   Kshitij Gupta found and fixed a problem with Glob and Glob w/ Ext
> behavior in aa-logprof and aa-genprof that would add duplicate
> entries to the interactive list of permissions.
>   
>   https://bugs.launchpad.net/bugs/1180230
 
> === modified file 'utils/Immunix/AppArmor.pm'
> --- utils/Immunix/AppArmor.pm	2012-09-27 21:57:21 +0000
> +++ utils/Immunix/AppArmor.pm	2013-07-05 21:12:08 +0000
> @@ -3879,8 +3879,8 @@
> -                                    if ($newpath ne $selected) {
> -                                        push @options, $newpath;
> +                                    if (not $newpath ~~ $options) {
> +					push @options, $newpath;

> @@ -3896,9 +3896,9 @@
> -                                    if ($newpath ne $selected) {
> -                                        push @options, $newpath;
> -                                        $defaultoption = $#options + 1;
> +                                    if (not $newpath ~~ @options) {
> +					push @options, $newpath;
> +					$defaultoption = $#options + 1;

Besides some accidential whitespace changes (probably tabs vs. spaces),
I'm wondering about

> +                                    if (not $newpath ~~ $options) {
vs.
> +                                    if (not $newpath ~~ @options) {

Note that in one case $options is used and @options in the other.

I somehow doubt that both are correct ;-)


Regards,

Christian Boltz
-- 
Verwandschaft, f. (pl) : Jemand, der auf dem Sofa sitzt und übelnimmt.
[Ratti in fontlinge-devel]