Attachment 586857 Details for Bug 825247 – storage patch fixing hal controller detection for disks

[patch] storage patch fixing hal controller detection for disks

storage.patch (text/plain), 1.89 KB, created by Greg Nichols on 2012-05-25 12:56:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-05-25 12:56:45 UTC

Size: 1.89 KB

patch

obsolete

>Index: storage.py
>===================================================================
>--- storage.py	(revision 1176)
>+++ storage.py	(working copy)
>@@ -45,6 +45,7 @@
>         
>     def plan(self, devices):
>         tests = dict()
>+        self.controllers = ''
>         for device in devices:
>             disk = self.planUDisks(device, devices)
>             
>@@ -67,7 +68,6 @@
>         if isinstance(device, UDisksDrive):
>             if device.getProperty("DeviceIsPartitionTable"):
>                 disk =  device.getProperty("DeviceFile")
>-                print "found device file " + disk
>                 # get rid of the "/dev/"
>                 if '/'in disk:
>                     disk = disk.split('/')[-1]
>@@ -75,7 +75,6 @@
>     
>     def planHAL(self, device, devices):
>         disk = None
>-        controllers = ''
>         if 'storage' in device.getProperty("info.capabilities") and device.getProperty("storage.drive_type") in ["disk", "sd_mmc"]: 
>             disk = device.getProperty("block.device")
>             # bug#437866 , plan by each controller, block device's parent is the HD, HD's parent is the controller, so need to track back twice
>@@ -88,12 +87,12 @@
>                     # then the contoller's ID is found
>                     controllerId = deviceItem.getProperty("info.parent")
>                     continue
>-            if controllerId in controllers:
>+            if controllerId in self.controllers:
>                 print "the controller %s is already in testplan, will skip the block device %s" % (controllerId, disk)
>                 disk = ''
>             else:
>                 # add the controller to the plan and record it
>-                controllers = controllers + ', ' + controllerId
>+                self.controllers = self.controllers + ', ' + controllerId
>                 # chop off /dev/ (5 characters) 
>                 if disk and len(disk) > 5:
>                     disk = disk[5:]

Actions: View | Diff

Attachments on bug 825247: 586857