Cleaning up previous propagation of version

derekdon · Dec 13, 2013 · d62969f · d62969f
1 parent 8e9ad07
commit d62969f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/application-configuration/config.js b/packages/application-configuration/config.js
@@ -90,7 +90,6 @@ AppConfig.getAppConfig = function () {
     throw new Error("there is no app config for this app");
   }
   var config = myApp.config;
-  config.version = myApp.currentStar;
   return config;
 };
 
@@ -116,10 +115,11 @@ AppConfig.configurePackage = function (packageName, configure) {
   // is empty (synchronously, though deferred would be OK).
   // XXX make sure that all callers of configurePackage deal well with multiple
   // callback invocations!  eg, email does not
-  configure(_.extend({version: appConfig.version}, lastConfig));
+  configure(lastConfig);
   var configureIfDifferent = function (app) {
-    if (!EJSON.equals(app.config && app.config.packages && app.config.packages[packageName] && app.config.version,
-                      lastConfig)) {
+    if (!EJSON.equals(
+           app.config && app.config.packages && app.config.packages[packageName],
+           lastConfig)) {
       lastConfig = app.config.packages[packageName];
       configure(_.extend({version: appConfig.version}, lastConfig));
     }

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
@@ -587,7 +587,6 @@ var runWebAppServer = function () {
               } else {
                 proxyConf = configuration.proxy;
               }
-              proxyConf.version = configuration.version;
               Log("Attempting to bind to proxy at " + proxyService.providers.proxy);
               WebAppInternals.bindToProxy(_.extend({
                 proxyEndpoint: proxyService.providers.proxy