summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-12-20 23:15:22 +0000
committerJeremy Katz <katzj@redhat.com>2004-12-20 23:15:22 +0000
commit06abe5e6124f25c73fc4e1cbd4500a2bb07ef0d0 (patch)
tree40666ba0febb3f3d9c8498b7015f6e603b5a7731
parent2553ee814063a140c50ba3a06cf267c66f5ccb12 (diff)
downloadanaconda-06abe5e6124f25c73fc4e1cbd4500a2bb07ef0d0.tar.gz
anaconda-06abe5e6124f25c73fc4e1cbd4500a2bb07ef0d0.tar.xz
anaconda-06abe5e6124f25c73fc4e1cbd4500a2bb07ef0d0.zip
2004-12-20 Jeremy Katz <katzj@redhat.com>
* partitions.py (Partitions.writeKS): Improve quoting of fstypes. Patch from Danen Brücker <dbrucker AT modwest DOT com> on anaconda-devel-list
-rw-r--r--ChangeLog7
-rw-r--r--partitions.py7
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8152cddf..8cb402566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-12-20 Jeremy Katz <katzj@redhat.com>
+ * partitions.py (Partitions.writeKS): Improve quoting of fstypes.
+ Patch from Danen Brücker <dbrucker AT modwest DOT com> on
+ anaconda-devel-list
+
+ * iw/progress_gui.py: Remove old InstallProgressWindow class to
+ avoid confusion with dead code
+
* scripts/mk-images (makeinitrd): Remove /dev creation from here,
it's handled by init now.
diff --git a/partitions.py b/partitions.py
index dc6fa83db..0c6a092e1 100644
--- a/partitions.py
+++ b/partitions.py
@@ -990,7 +990,7 @@ class Partitions:
args.extend(["prepboot", "--fstype", "\"PPC PReP Boot\""])
elif request.mountpoint:
fstype = request.fstype.getName()
- if fstype.find(" "):
+ if fstype.find(" ") > 0:
fstype = "\"%s\"" %(fstype,)
args.append(request.mountpoint)
args.append("--fstype")
@@ -1060,8 +1060,11 @@ class Partitions:
if not request.format:
args.append("--noformat")
if request.fstype:
+ fstype = request.fstype.getName()
+ if fstype.find(" ") > 0:
+ fstype = "\"%s\"" %(fstype,)
args.append("--fstype")
- args.append(request.fstype.getName())
+ args.append(fstype)
if request.badblocks:
args.append("--badblocks")