Attachment 7517 Details for Bug 17856 – patch for test-udisk which removed skips all empty media

[patch] patch for test-udisk which removed skips all empty media

test-udisk.patch (text/plain), 1.27 KB, created by Hartmut Goebel on 2016-03-06 11:14:56 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Hartmut Goebel

Created: 2016-03-06 11:14:56 CET

Size: 1.27 KB

patch

obsolete

>--- test-udisk.py.orig	2016-03-06 11:10:09.714232635 +0100
>+++ test-udisk.py	2016-03-06 11:11:52.614133257 +0100
>@@ -76,7 +76,7 @@
> 
>         for dev in devs:
>             dev_obj =objects[dev['path']]['org.freedesktop.UDisks2.Drive']
>-            output += "ConnectionBus %s Removable %d MediaRemovable %d\n"%(dev_obj['ConnectionBus'],dev_obj['Removable'], dev_obj['MediaRemovable'] )
>+            output += "ConnectionBus %s Removable %d MediaRemovable %d Size %i\n"%(dev_obj['ConnectionBus'],dev_obj['Removable'], dev_obj['MediaRemovable'], dev_obj['Size'] )
>             if (dev_obj['ConnectionBus'] == 'usb' or dev_obj['ConnectionBus'] == 'sdio') and \
>                  (dev_obj['Removable'] == 1 or dev_obj['MediaRemovable'] == 1 ):
>                item=[]
>@@ -86,6 +86,10 @@
>                    if dev['path'] == objects[block['path']]['org.freedesktop.UDisks2.Block']['Drive']:
>                        path = '/dev/'+block['path'].split('/')[-1]
>                size = dev_obj['Size']
>+               if not size:
>+                   # "empty" device, so this is a device without a
>+                   # media plugged in, e.g. a multi-card reader
>+                   continue
>                item.append(vend+" "+name)
>                item.append(path)
>                item.append(size)

--- test-udisk.py.orig	2016-03-06 11:10:09.714232635 +0100
+++ test-udisk.py	2016-03-06 11:11:52.614133257 +0100
@@ -76,7 +76,7 @@
 
         for dev in devs:
             dev_obj =objects[dev['path']]['org.freedesktop.UDisks2.Drive']
-            output += "ConnectionBus %s Removable %d MediaRemovable %d\n"%(dev_obj['ConnectionBus'],dev_obj['Removable'], dev_obj['MediaRemovable'] )
+            output += "ConnectionBus %s Removable %d MediaRemovable %d Size %i\n"%(dev_obj['ConnectionBus'],dev_obj['Removable'], dev_obj['MediaRemovable'], dev_obj['Size'] )
             if (dev_obj['ConnectionBus'] == 'usb' or dev_obj['ConnectionBus'] == 'sdio') and \
                  (dev_obj['Removable'] == 1 or dev_obj['MediaRemovable'] == 1 ):
                item=[]
@@ -86,6 +86,10 @@
                    if dev['path'] == objects[block['path']]['org.freedesktop.UDisks2.Block']['Drive']:
                        path = '/dev/'+block['path'].split('/')[-1]
                size = dev_obj['Size']
+               if not size:
+                   # "empty" device, so this is a device without a
+                   # media plugged in, e.g. a multi-card reader
+                   continue
                item.append(vend+" "+name)
                item.append(path)
                item.append(size)

Actions: View | Diff

Attachments on bug 17856: 7516 | 7517