[Selinux-commits] SF.net SVN: selinux: [2162] trunk/policycoreutils/semanage/seobject.py

[<ssm...@us...>]

Revision: 2162
          http://svn.sourceforge.net/selinux/?rev=2162&view=rev
Author:   ssmalley
Date:     2007-01-09 12:41:26 -0800 (Tue, 09 Jan 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: patch to make seobject.py work correctly.
Date: Tue, 09 Jan 2007 10:18:06 -0500

This patch should be upstreamable as controversial parts removed.

Modified Paths:
--------------
    trunk/policycoreutils/semanage/seobject.py

Modified: trunk/policycoreutils/semanage/seobject.py
===================================================================
--- trunk/policycoreutils/semanage/seobject.py	2007-01-09 20:40:39 UTC (rev 2161)
+++ trunk/policycoreutils/semanage/seobject.py	2007-01-09 20:41:26 UTC (rev 2162)
@@ -94,23 +94,25 @@
 	return re.search("^" + reg +"$",raw)
 
 def translate(raw, prepend = 1):
-	if prepend == 1:
-		context = "a:b:c:%s" % raw
+        filler="a:b:c:"
+        if prepend == 1:
+		context = "%s%s" % (filler,raw)
 	else:
 		context = raw
 	(rc, trans) = selinux.selinux_raw_to_trans_context(context)
 	if rc != 0:
 		return raw
 	if prepend:
-		trans = trans.strip("a:b:c")
+		trans = trans[len(filler):]
 	if trans == "":
 		return raw
 	else:
 		return trans
 	
 def untranslate(trans, prepend = 1):
+        filler="a:b:c:"
  	if prepend == 1:
-		context = "a:b:c:%s" % trans
+		context = "%s%s" % (filler,trans)
 	else:
 		context = trans
 
@@ -118,7 +120,7 @@
 	if rc != 0:
 		return trans
 	if prepend:
-		raw = raw.strip("a:b:c")	
+		raw = raw[len(filler):]
 	if raw == "":
 		return trans
 	else:
@@ -157,7 +159,7 @@
 	def out(self):
 		rec = ""
 		for c in self.comments:
-			rec += c +"\n"
+			rec += c
 		keys = self.ddict.keys()
 		keys.sort()
 		for k in keys:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.