Re: chcat fixes

* Re: chcat fixes
       [not found] <C639DAB6.A73D6%csellers@tresys.com>
@ 2009-05-21 12:13 ` Daniel J Walsh
  2009-06-19 17:30   ` Joshua Brindle
  2009-06-23 17:06   ` Joshua Brindle
  0 siblings, 2 replies; 6+ messages in thread
From: Daniel J Walsh @ 2009-05-21 12:13 UTC (permalink / raw)
  To: Chad Sellers, SE Linux

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

On 05/20/2009 04:05 PM, Chad Sellers wrote:
> On 5/20/09 3:00 PM, "Daniel J Walsh"<dwalsh@redhat.com>  wrote:
>
>> Expansion of categores is still broken.  Here is a patch to fix.
>>
> This message appears to be missing a patch.
>
> Thanks,
> Chad
>


[-- Attachment #2: policycoreutils-chcat.patch --]
[-- Type: text/plain, Size: 939 bytes --]

--- nsapolicycoreutils/scripts/chcat	2009-01-13 08:45:35.000000000 -0500
+++ policycoreutils-2.0.62/scripts/chcat	2009-05-04 13:40:26.000000000 -0400
@@ -281,14 +281,14 @@
 def expandCats(cats):
     newcats = []
     for c in cats:
-        if c.find(".") != -1:
-            c = c.split(".")
-            for i in range(int(c[0][1:]), int(c[1][1:]) + 1):
-                x = ("c%d" % i)
-                if x not in newcats:
-                    newcats.append("c%d" % i)
-        else:
-            for i in c.split(","):
+        for i in c.split(","):
+            if i.find(".") != -1:
+                j = i.split(".")
+                for k in range(int(j[0][1:]), int(j[1][1:]) + 1):
+                    x = ("c%d" % k)
+                    if x not in newcats:
+                        newcats.append(x)
+            else:
                 if i not in newcats:
                     newcats.append(i)
     if len(newcats) > 25:

^ permalink raw reply	[flat|nested] 6+ messages in thread