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

[Marc Tardif]

[Daniel Manrique (roadmr)]

Thanks!

Merging...

review: Approve

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2011-10-11 20:15:01 +0000
+++ checkbox/parsers/udevadm.py	2012-02-02 21:23:18 +0000
@@ -270,7 +270,11 @@
 
     @property
     def path(self):
-        return self._environment.get("DEVPATH")
+        devpath = self._environment.get("DEVPATH")
+        if self._environment.get("DEVTYPE") == "disk" and self._stack:
+            devpath = re.sub(r"/[^/]+/[^/]+$", "", devpath)
+
+        return devpath
 
     @property
     def product_id(self):

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 21:12:28 +0000
+++ debian/changelog	2012-02-02 21:23:18 +0000
@@ -1,5 +1,12 @@
 checkbox (0.13.1) precise; urgency=low
 
+  [Marc Tardif]
+  * Removed trailing directories from the devpath of disk devices (LP: #925582)
+
+ -- Marc Tardif <[e-mail]>  Thu, 02 Feb 2012 16:17:41 -0500
+
+checkbox (0.13.1) precise; urgency=low
+
   [Brendan Donegan]
   * Fixed the cpu_topology script so that it doesn't mistake the word
     'processor' in the value of another field for the field 'processor'