Merge pull request #476 from lissyx/bug1212845

Bug 1212845 - Fix build without FOTA_DEVICE_DATA_FILES r=gsvelto
mozilla-b2g · Oct 8, 2015 · da17fd0 · da17fd0
2 parents 858bee2 + 43b550e
commit da17fd0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/tools/update-tools/update_tools.py b/tools/update-tools/update_tools.py
@@ -1072,10 +1072,14 @@ def CleanDeviceFiles(self):
         # Device-specific files that we need to cleanup
         # Should be specified as a space-separated list of files in
         # the env variable FOTA_DEVICE_DATA_FILES
-        deviceCleanup = filter(lambda x: len(x) > 0, os.environ.get("FOTA_DEVICE_DATA_FILES").split(" "))
+        if not os.environ.has_key("FOTA_DEVICE_DATA_FILES"):
+            return
+
+        files = os.environ.get("FOTA_DEVICE_DATA_FILES")
+        if len(files) < 1:
+            return
 
-        if len(deviceCleanup) < 1:
-	    return
+        deviceCleanup = filter(lambda x: len(x) > 0, files.split(" "))
 
         # sdcard will already be mounted anyway
         self.AssertMountIfNeeded("/data")