Merge pull request #2749 from balena-io/remove-double-error-message

Remove double error message

lib/gui/app/modules/image-writer.js

@@ -200,8 +200,7 @@ exports.performWrite = (image, drives, onProgress) => {
         imagePath: image,
         destinations: drives,
         validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
-        unmountOnSuccess: settings.get('unmountOnSuccess'),
+        unmountOnSuccess: settings.get('unmountOnSuccess')
-        checksumAlgorithms: [ 'xxhash' ]
       })
     })
 
@@ -259,14 +258,14 @@ exports.performWrite = (image, drives, onProgress) => {
           })
         }
 
-        return resolve(flashResults)
+        resolve(flashResults)
       }).catch((error) => {
         // This happens when the child is killed using SIGKILL
         const SIGKILL_EXIT_CODE = 137
         if (error.code === SIGKILL_EXIT_CODE) {
           error.code = 'ECHILDDIED'
         }
-        return reject(error)
+        reject(error)
       }).finally(() => {
         console.log('Terminating IPC server')
         terminateServer()

lib/gui/app/pages/main/controllers/flash.js

@@ -22,7 +22,7 @@ const flashState = require('../../../models/flash-state')
 const driveScanner = require('../../../modules/drive-scanner')
 const progressStatus = require('../../../modules/progress-status')
 const notification = require('../../../os/notification')
-const exceptionReporter = require('../../../modules/exception-reporter')
+const analytics = require('../../../modules/analytics')
 const imageWriter = require('../../../modules/image-writer')
 const path = require('path')
 const store = require('../../../models/store')
@@ -145,12 +145,13 @@ module.exports = function (
     driveScanner.stop()
 
     const iconPath = '../../../assets/icon.png'
+    const basename = path.basename(image.path)
     try {
       await imageWriter.flash(image.path, drives)
       if (!flashState.wasLastFlashCancelled()) {
         const flashResults = flashState.getFlashResults()
         notification.send('Flash complete!', {
-          body: messages.info.flashComplete(path.basename(image.path), drives, flashResults.results.devices),
+          body: messages.info.flashComplete(basename, drives, flashResults.results.devices),
           icon: iconPath
         })
         $state.go('success')
@@ -181,7 +182,8 @@ module.exports = function (
         FlashErrorModalService.show(messages.error.childWriterDied())
       } else {
         FlashErrorModalService.show(messages.error.genericFlashError())
-        exceptionReporter.report(error)
+        error.image = basename
+        analytics.logException(error)
       }
     } finally {
       availableDrives.setDrives([])

lib/shared/messages.js

@@ -171,7 +171,7 @@ module.exports = {
     },
 
     genericFlashError: () => {
-      return 'Oops, seems something went wrong.'
+      return 'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.'
     },
 
     validation: () => {