[Uludag-commits] r17620 - in branches/yali4/yali4: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Fri Apr 11 16:39:23 2008
New Revision: 17620

Modified:
   branches/yali4/yali4/gui/DiskWidgets.py
   branches/yali4/yali4/partitiontype.py
Log:
 * some pretty logs, correct way for checking has_request..

Modified: branches/yali4/yali4/gui/DiskWidgets.py
=================================================================
--- branches/yali4/yali4/gui/DiskWidgets.py	(original)
+++ branches/yali4/yali4/gui/DiskWidgets.py	Fri Apr 11 16:39:23 2008
@@ -25,6 +25,7 @@
 import yali4.parteddata as parteddata
 
 import yali4.gui.context as ctx
+
 from yali4.gui.Ui.partedit import Ui_PartEdit
 from yali4.gui.GUIException import *
 from yali4.gui.GUIAdditional import ResizeWidget
@@ -129,6 +130,9 @@
         self.updatePartEdit()
         self.checkRootPartRequest()
 
+        for req in ctx.partrequests:
+            ctx.debugger.log("REQ : %s - %s %s" % (req._partition.getPath(), req._partition.getMB(), req._partition_type.name))
+
     def checkRootPartRequest(self):
         ctx.mainScreen.disableNext()
         for req in ctx.partrequests:
@@ -227,7 +231,7 @@
             else:
                 name = _("Free Space")
             ctx.debugger.log("Partition added with %s mb" % part.getMB())
-            diskItem.addPartition(name,part)
+            diskItem.addPartition(name, part)
 
         diskItem.updateSizes(self.tabWidget.width())
 
@@ -270,6 +274,13 @@
         if not t:
             return False
 
+        hasReq = ctx.partrequests.searchPartTypeAndReqType(t, 1)
+
+        if hasReq:
+            self.partEdit.ui.information.setText(_("There is a request for the same Partition Type."))
+            self.partEdit.ui.information.show()
+            return False
+
         def edit_requests(partition):
             """edit partition. just set the filesystem and flags."""
             if self.partEdit.ui.formatCheck.isChecked():
@@ -528,15 +539,17 @@
         return _p
 
 
-def getPartitionType(part,rt=1):
+def getPartitionType(part, rt=1):
     """ Get partition type from request list """
     for pt in partitionTypes.values():
-
         # We use MountRequest type for search keyword 
         # which is 1, defined in partitionrequest.py
         req = ctx.partrequests.searchPartTypeAndReqType(pt, rt)
         if req:
+            ctx.debugger.log("GPT #0: %s vs. %s " % (req.partition().getPath(), part.getPath()))
             if req.partition() == part:
+                ctx.debugger.log("GPT #1: %s " % part.getPath())
+                ctx.debugger.log("GPT #2: %s " % pt.name)
                 return pt
 
 class PartEdit(QtGui.QWidget):

Modified: branches/yali4/yali4/partitiontype.py
=================================================================
--- branches/yali4/yali4/partitiontype.py	(original)
+++ branches/yali4/yali4/partitiontype.py	Fri Apr 11 16:39:23 2008
@@ -27,7 +27,8 @@
     # @param rhs: PartitionType
     def __eq__(self, rhs):
         if rhs:
-            return self.filesystem == rhs.filesystem
+            if hasattr(rhs, "filesystem"):
+                return self.filesystem == rhs.filesystem
         return False
 
 ##