Merge pull request #386 from comoyo/bug1061134

Bug 1061134 - Use DeleteFilesRecursive from edify generator. r=gsvelto
mozilla-b2g · Oct 27, 2014 · b948ccf · b948ccf
2 parents a2d5d06 + fc9406f
commit b948ccf
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/tools/update-tools/update_tools.py b/tools/update-tools/update_tools.py
@@ -1050,8 +1050,7 @@ def build_flash_script(self):
         if self.fota_type == 'partial':
             for d in self.fota_dirs:
                 self.generator.Print("Cleaning " + d)
-                cmd = ('delete_recursive("%s");' % ("/"+d))
-                self.generator.script.append(self.generator._WordWrap(cmd))
+                self.generator.DeleteFilesRecursive(["/"+d])
 
             cmd = ('if greater_than_int(run_program("/system/bin/mv", "/system/b2g.bak", "/system/b2g"), 0) then')
             self.generator.script.append(self.generator._WordWrap(cmd))
@@ -1064,8 +1063,7 @@ def build_flash_script(self):
         self.generator.DeleteFiles(["/system/b2g/libdmd.so"])
 
         self.generator.Print("Remove stale update")
-        cmd = ('delete_recursive("/system/b2g/updated");')
-        self.generator.script.append(self.generator._WordWrap(cmd))
+        self.generator.DeleteFilesRecursive(["/system/b2g/updated"])
 
         self.generator.Print("Extracting files to /system")
         self.generator.UnpackPackageDir("system", "/system")