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

[Marc Tardif]

[Daniel Manrique (roadmr)]

Looks good! Merging...

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-10 13:35:43 +0000
+++ debian/changelog	2012-09-10 20:37:30 +0000
@@ -43,6 +43,7 @@
   [Marc Tardif]
   * scripts/touchpad_scroll_resource: Added support for systems without
     a touchpad (LP #1045066)
+  * patch/0.14.2: Fixed patch to rmtree instead of rmdir scripts directory.
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after

=== modified file 'patches/0.14.2'
--- patches/0.14.2	2012-07-13 19:58:25 +0000
+++ patches/0.14.2	2012-09-10 20:37:30 +0000
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import shutil
 
 
 def main(args):
@@ -9,7 +10,7 @@
         share_dir = "/usr/share/checkbox/scripts"
         lib_dir = "../../lib/checkbox/bin"
         if os.path.isdir(share_dir) and not os.path.islink(share_dir):
-            os.rmdir(share_dir)
+            shutil.rmtree(share_dir)
             os.symlink(lib_dir, share_dir)