[Uludag-commits] r15570 - in trunk/yali/yali: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Mon Oct  1 11:05:30 2007
New Revision: 15570

Modified:
   trunk/yali/yali/filesystem.py
   trunk/yali/yali/fstab.py
   trunk/yali/yali/gui/ScrInstall.py
Log:
BUG:FIXED:6177

Modified: trunk/yali/yali/filesystem.py
=================================================================
--- trunk/yali/yali/filesystem.py	(original)
+++ trunk/yali/yali/filesystem.py	Mon Oct  1 11:05:30 2007
@@ -443,7 +443,7 @@
     def getLabel(self, partition):
         label = None
         fd = self.openPartition(partition)
-        
+
         pagesize = resource.getpagesize()
         try:
             buf = os.read(fd, pagesize)

Modified: trunk/yali/yali/fstab.py
=================================================================
--- trunk/yali/yali/fstab.py	(original)
+++ trunk/yali/yali/fstab.py	Mon Oct  1 11:05:30 2007
@@ -47,7 +47,7 @@
     def insert(self, e):
         if e.filesystem == "linux-swap(new)":
             e.filesystem = "swap"
-            
+
         l = "%-20s %-16s %-9s %-20s %s %s\n" % (
             e.device, e.mountpoint, e.filesystem,
             e.options, e.d, e.p)

Modified: trunk/yali/yali/gui/ScrInstall.py
=================================================================
--- trunk/yali/yali/gui/ScrInstall.py	(original)
+++ trunk/yali/yali/gui/ScrInstall.py	Mon Oct  1 11:05:30 2007
@@ -165,7 +165,7 @@
                 pt = req.partitionType()
 
                 path = "LABEL=%s" % pt.filesystem.getLabel(p)
-                fs = p.getFSName()
+                fs = pt.filesystem._name
                 mountpoint = pt.mountpoint
                 # TODO: consider merging mountoptions in filesystem.py
                 opts = ",".join([pt.filesystem.mountOptions(), pt.mountoptions])