Merge pull request #481 from openstf/add-automation-label

Use automation label in device list for devices accessed using API

lib/units/websocket/index.js

@@ -174,6 +174,7 @@ module.exports = function(options) {
               serial: message.serial
             , owner: message.owner
             , likelyLeaveReason: 'owner_change'
+            , usage: message.usage
             }
           , user
           )
@@ -397,8 +398,15 @@ module.exports = function(options) {
               , wireutil.envelope(new wire.AdbKeysUpdatedMessage())
               ])
             })
-            .catch(dbapi.DuplicateSecondaryIndexError, function() {
-              // No-op
+            .catch(dbapi.DuplicateSecondaryIndexError, function(err) {
+              socket.emit('user.keys.adb.error', {
+                message: 'Someone already added this key'
+              })
+            })
+            .catch(Error, function(err) {
+              socket.emit('user.keys.adb.error', {
+                message: err.message
+              })
             })
         })
         .on('user.keys.adb.accept', function(data) {