merge mozilla-central to autoland. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 09 Nov 2017 00:52:17 +0100
changeset 444137 b23e1d8de55e99fc32c4115d7f6190343030a5a6
parent 444136 b12daff50304db61d4250754c58b7250778b141c (current diff)
parent 444084 e2f87726b6082db0ae8a0866f65bff6b7062a07c (diff)
child 444138 5c905129301eab91c066c83095b7a1ce335de52e
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge mozilla-central to autoland. r=merge a=merge
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -1,9 +1,16 @@
 {
+    "ach": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "an": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
@@ -74,16 +81,23 @@
     "br": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
+    "bs": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "ca": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
@@ -338,16 +352,23 @@
     "hy-AM": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
+    "ia": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "id": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
@@ -426,16 +447,23 @@
     "lt": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
+    "ltg": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "lv": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
@@ -506,16 +534,23 @@
     "nn-NO": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
+    "oc": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "or": {
         "platforms": [
             "android", 
             "android-api-16", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -669,17 +669,20 @@ class DesktopUnittest(TestingMixin, Merc
         except:
             f.write("Exception getting system info: %s" % sys.exc_info()[0])
 
     def _report_system_info(self):
         """
            Create the system-info.log artifact file, containing a variety of
            system information that might be useful in diagnosing test failures.
         """
-        import psutil
+        try:
+            import psutil
+        except:
+            return
         dir = self.query_abs_dirs()['abs_blob_upload_dir']
         self.mkdir_p(dir)
         path = os.path.join(dir, "system-info.log")
         with open(path, "w") as f:
             self._report_line(f, "System info collected at ", datetime.now())
             self._report_line(f, "\nBoot time ", datetime.fromtimestamp(psutil.boot_time()))
             self._report_line(f, "\nVirtual memory: ", psutil.virtual_memory())
             self._report_line(f, "\nDisk partitions: ", psutil.disk_partitions())