Merge lp:~cr3/checkbox/942548 into lp:checkbox

[Marc Tardif]

This change has been tested to work with:

A system on the ata bus, the output is the same as before.

A system with a RAID controller on the cciss bus:

> path: /devices/pci0000:40/0000:40:10.0/0000:46:00.0/cciss0/c0d0
> bus: cciss
> category: DISK
> product: LOGICAL VOLUME
> vendor: HP

And a system with a SCSI device on the scsi bus:

> path: /devices/pci0000:00/0000:00:01.0/0000:01:00.0/0000:02:08.0/host4/target4:1:0/4:1:0:0
> bus: scsi
> category: DISK
> driver: sd
> product: VIRTUAL DISK
> vendor: Dell

[Brendan Donegan (brendan-donegan)]

Looks like this should do the job. I'll merge this and backport to Lucid as well

review: Approve

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-02-28 11:09:34 +0000
+++ checkbox/parsers/udevadm.py	2012-02-28 21:51:17 +0000
@@ -343,9 +343,8 @@
             for device in reversed(self._stack):
                 if device._environment.get("ID_BUS") == "usb":
                     return decode_id(device._environment["ID_MODEL_ENC"])
-
-        if self._environment.get("DEVTYPE") == "disk" \
-           and self._environment.get("ID_BUS") in ("ata", "scsi","cciss"):
+        elif self._environment.get("DEVTYPE") == "disk" \
+             and "ID_MODEL_ENC" in self._environment:
             return decode_id(self._environment["ID_MODEL_ENC"])
 
         # floppy
@@ -372,6 +371,9 @@
             for device in reversed(self._stack):
                 if device._environment.get("ID_BUS") == "usb":
                     return decode_id(device._environment["ID_VENDOR_ENC"])
+        elif self._environment.get("DEVTYPE") == "disk" \
+             and "ID_VENDOR_ENC" in self._environment:
+            return decode_id(self._environment["ID_VENDOR_ENC"])
 
         return None