From 20ec4774504b1ce4c06d8921d2925b9865b374a1 Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Wed, 1 Jun 2016 23:15:50 +0900
Subject: [PATCH] Remove eslint errors.

---
 .eslintrc            | 4 ++--
 lib/util/datautil.js | 3 ++-
 package.json         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index d06fd538..d120e453 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -52,7 +52,7 @@
     "no-process-env": 0, // `2` is recommended
     "no-proto": 2,
     "no-redeclare": [2, {"builtinGlobals": true}], // `2` is recommended and actually defaults to `[2, {"builtinGlobals": false}]`
-    "no-return-assign": [2, "except-parens"],
+    "no-return-assign": [1, "except-parens"],
     "no-script-url": 2,
     "no-self-compare": 2,
     "no-sequences": 2,
@@ -153,6 +153,6 @@
     "no-sync": 1, // `2` is default
 
     // eslint v2
-    "keyword-spacing": 2
+    //"keyword-spacing": 2
   }
 }
diff --git a/lib/util/datautil.js b/lib/util/datautil.js
index ddbb0066..dfbe6b00 100644
--- a/lib/util/datautil.js
+++ b/lib/util/datautil.js
@@ -26,7 +26,8 @@ datautil.applyData = function(device) {
   }
   else {
     log.info(
-      'Device database does not have an entry for "%s" (model "%s"/"%s"). This is not an error, it only means that we don\'t have data for it yet.'
+      'Device database does not have an entry for "%s" (model "%s"/"%s"). ' +
+      'This is not an error, it only means that we don\'t have data for it yet.'
     , device.serial
     , device.model
     , device.product
diff --git a/package.json b/package.json
index 053aa2ee..4fc56aef 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "chai": "^3.4.1",
     "css-loader": "^0.23.1",
     "del": "^2.0.1",
-    "eslint": "^2.0.0-beta.1",
+    "eslint": "^2.11.1",
     "event-stream": "^3.3.2",
     "exports-loader": "^0.6.2",
     "extract-text-webpack-plugin": "^1.0.1",