Fix conflicts from rebase

tessel · Jul 31, 2016 · 9fa0438 · 9fa0438
1 parent b020cd6
commit 9fa0438
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/bin/tessel-2.js b/bin/tessel-2.js
@@ -141,7 +141,10 @@ parser.command('provision')
   .help('Authorize your computer to control the USB-connected Tessel');
 
 parser.command('restore')
-  .callback(callControllerCallback('restoreTessel'))
+  .callback(options => {
+    log.level(options.loglevel);
+    callControllerWith('restoreTessel', options);
+  })
   .option('openwrt', {
     abbr: 'o',
     flag: true,

diff --git a/lib/flash.js b/lib/flash.js
@@ -1,6 +1,6 @@
 var async = require('async');
 var PAGE = 256;
-var logs = require('./logs');
+var log = require('./log');
 var CHIP_ID = new Buffer([0x01, 0x02, 0x19]);
 
 function address(addr) {
@@ -147,7 +147,7 @@ function randbyte() {
 }
 
 function asyncLog(msg, next) {
-  logs.info(msg);
+  log.info(msg);
   next();
 }
 

diff --git a/lib/tessel/restore.js b/lib/tessel/restore.js
@@ -1,13 +1,13 @@
 var Tessel = require('./tessel');
 var update = require('../update-fetch');
-var logs = require('../logs');
+var log = require('../log');
 var flash = require('../flash');
 
 Tessel.prototype.restore = function restore(opts) {
   var usbConnection = this.connection;
   return new Promise(function(resolve, reject) {
     if (opts.openwrt) {
-      logs.info('Proceeding with updating OpenWrt...');
+      log.info('Proceeding with updating OpenWrt...');
 
       // download images
       return update.fetchRestore()

diff --git a/lib/update-fetch.js b/lib/update-fetch.js
@@ -157,7 +157,7 @@ function downloadTgz(tgzUrl, fileMap) {
           return reject(new Error('Fetched file wasn\'t formatted properly.'));
         }
       }
-      logs.info('Download complete!');
+      log.info('Download complete!');
       return resolve(files);
     });