2007-01-18 Jeremy Katz <katzj@redhat.com>

	* xsetup.py (XSetup.writeKS): Don't redefine str

	* livecd.py (LiveCDCopyBackend._doFilesystemMangling): Fix syntax error

1 files changed, 4 insertions, 4 deletions

diff --git a/xsetup.py b/xsetup.py
index c61121725..0fec1a81b 100644
--- a/xsetup.py
+++ b/xsetup.py
@@ -53,10 +53,10 @@ class XSetup:
             f.write("xconfig %s\n" % string.join(args, " "))
 
         if ksconfig:
-            str = ksconfig.xconfig.__str__().rstrip() + string.join(args, " ")
-            f.write(str + "\n")
+            s = ksconfig.xconfig.__str__().rstrip() + string.join(args, " ")
+            f.write(s + "\n")
 
-            str = ksconfig.monitor.__str__().rstrip() + string.join(args, " ")
-            f.write(str + "\n")
+            s = ksconfig.monitor.__str__().rstrip() + string.join(args, " ")
+            f.write(s + "\n")
         elif args != []:
             f.write("xconfig %s\n" % string.join(args, " "))