remove superfluous addons.updateAddons

src/addons.js

@@ -3,7 +3,6 @@
 exports = module.exports = {
     setupAddons: setupAddons,
     teardownAddons: teardownAddons,
-    updateAddons: updateAddons,
     backupAddons: backupAddons,
     restoreAddons: restoreAddons,
 
@@ -150,26 +149,6 @@ function teardownAddons(app, addons, callback) {
     }, callback);
 }
 
-function updateAddons(app, oldAddons, newAddons, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert(!oldAddons || typeof oldAddons === 'object');
-    assert(!newAddons || typeof newAddons === 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    setupAddons(app, newAddons, function (error) {
-        if (error) return callback(error);
-
-        if (!oldAddons) return callback(null);
-
-        // teardown the old addons
-        async.eachSeries(_.difference(Object.keys(oldAddons), Object.keys(newAddons)), function iterator(addon, iteratorCallback) {
-            if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
-
-            KNOWN_ADDONS[addon].teardown(app, iteratorCallback);
-        }, callback);
-    });
-}
-
 function backupAddons(app, addons, callback) {
     assert.strictEqual(typeof app, 'object');
     assert(!addons || typeof addons === 'object');

src/apptask.js

@@ -50,8 +50,8 @@ var addons = require('./addons.js'),
     sysinfo = require('./sysinfo.js'),
     util = require('util'),
     uuid = require('node-uuid'),
-    vbox = require('./vbox.js');
-
+    vbox = require('./vbox.js'),
+    _ = require('underscore');
 
 var NGINX_APPCONFIG_EJS = fs.readFileSync(__dirname + '/../setup/start/nginx/appconfig.ejs', { encoding: 'utf8' }),
     COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd.config.ejs', { encoding: 'utf8' }),
@@ -721,6 +721,8 @@ function configure(app, callback) {
 function update(app, callback) {
     debugApp(app, 'Updating to %s', safe.query(app, 'manifest.version'));
 
+    var extraAddons = _.difference(Object.keys(app.oldConfig.manifest.addons), Object.keys(app.manifest.addons));
+
     async.series([
         updateApp.bind(null, app, { installationProgress: '0, Verify manifest' }),
         verifyManifest.bind(null, app),
@@ -749,7 +751,8 @@ function update(app, callback) {
         downloadImage.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: '70, Updating addons' }),
-        addons.updateAddons.bind(null, app, app.oldConfig.manifest, app.manifest),
+        addons.teardownAddons.bind(null, app, extraAddons),
+        addons.setupAddons.bind(null, app, app.manifest.addons),
 
         updateApp.bind(null, app, { installationProgress: '80, Creating container' }),
         createContainer.bind(null, app),