Merge branch 'dev' into site-restart

Azure · Oct 30, 2012 · 596495a · 596495a
2 parents 48cc3a7 + 616e302
commit 596495a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/cli/commands/site.js b/lib/cli/commands/site.js
@@ -320,7 +320,7 @@ exports.init = function(cli) {
           if (!context.spaces) {
             return cacheUtils.readSpaces(context, __cb(_, __frame, 2, 31, function ___(__0, __1) { context.spaces = __1; return (function __$ensureSpaces(__then) {
                 if ((!context.spaces || !context.spaces.length)) {
-                  return context.site.doSpacesGet(context, __cb(_, __frame, 4, 33, function ___(__0, __2) { context.spaces = __2; __then(); }, true)); } else { __then(); } ; })(__then); }, true)); } else { __then(); } ; })(_); }); }; var __frame = { name: "__2", line: 128 }; return __func(_, this, arguments, __2, 2, __frame, function __$__2() { context = { subscription: cli.category("account").lookupSubscriptionId(options.subscription), git: options.git, site: { name: nameArg, webspace: options.location, hostname: options.hostname }, publishingUser: options.publishingUsername, github: { username: options.githubusername, password: options.githubpassword, repositoryFullName: options.githubrepository }, flags: { } }; if ((options.git && options.github)) { return _(new Error("Please run the command with either --git or --github options. Not both.")); } ; return promptForSiteName(__cb(_, __frame, 23, 10, function __$__2() { return determineIfSiteExists(__cb(_, __frame, 24, 10, function __$__2() { return promptForLocation(__cb(_, __frame, 25, 10, function __$__2() { return createSite(__cb(_, __frame, 26, 10, function __$__2() { return (function __$__2(__then) { if ((options.git || options.github)) { if (options.github) { context.lvcClient = linkedRevisionControl.createClient(cli, "github"); } else { if (options.git) { context.lvcClient = linkedRevisionControl.createClient(cli, "git"); } ; } ; return context.lvcClient.init(context, __cb(_, __frame, 36, 12, function __$__2() { return copyIisNodeWhenServerJsPresent(__cb(_, __frame, 39, 12, function __$__2() { return updateLocalConfigWithSiteName(__cb(_, __frame, 40, 12, function __$__2() { return initializeRemoteRepo(__cb(_, __frame, 42, 12, function __$__2() { return (function __$__2(__then) { if (options.git) { return addRemoteToLocalGitRepo(__cb(_, __frame, 45, 14, __then, true)); } else { return (function __$__2(__then) { if (options.github) { return site.ensureRepositoryUri(context, __cb(_, __frame, 47, 14, __then, true)); } else { __then(); } ; })(__then); } ; })(function __$__2() { return context.lvcClient.deploy(context, __cb(_, __frame, 50, 12, __then, true)); }); }, true)); }, true)); }, true)); }, true)); } else { __then(); } ; })(_); }, true)); }, true)); }, true)); }, true)); }); });
+                  return site.doSpacesGet(context, __cb(_, __frame, 4, 33, function ___(__0, __2) { context.spaces = __2; __then(); }, true)); } else { __then(); } ; })(__then); }, true)); } else { __then(); } ; })(_); }); }; var __frame = { name: "__2", line: 128 }; return __func(_, this, arguments, __2, 2, __frame, function __$__2() { context = { subscription: cli.category("account").lookupSubscriptionId(options.subscription), git: options.git, site: { name: nameArg, webspace: options.location, hostname: options.hostname }, publishingUser: options.publishingUsername, github: { username: options.githubusername, password: options.githubpassword, repositoryFullName: options.githubrepository }, flags: { } }; if ((options.git && options.github)) { return _(new Error("Please run the command with either --git or --github options. Not both.")); } ; return promptForSiteName(__cb(_, __frame, 23, 10, function __$__2() { return determineIfSiteExists(__cb(_, __frame, 24, 10, function __$__2() { return promptForLocation(__cb(_, __frame, 25, 10, function __$__2() { return createSite(__cb(_, __frame, 26, 10, function __$__2() { return (function __$__2(__then) { if ((options.git || options.github)) { if (options.github) { context.lvcClient = linkedRevisionControl.createClient(cli, "github"); } else { if (options.git) { context.lvcClient = linkedRevisionControl.createClient(cli, "git"); } ; } ; return context.lvcClient.init(context, __cb(_, __frame, 36, 12, function __$__2() { return copyIisNodeWhenServerJsPresent(__cb(_, __frame, 39, 12, function __$__2() { return updateLocalConfigWithSiteName(__cb(_, __frame, 40, 12, function __$__2() { return initializeRemoteRepo(__cb(_, __frame, 42, 12, function __$__2() { return (function __$__2(__then) { if (options.git) { return addRemoteToLocalGitRepo(__cb(_, __frame, 45, 14, __then, true)); } else { return (function __$__2(__then) { if (options.github) { return site.ensureRepositoryUri(context, __cb(_, __frame, 47, 14, __then, true)); } else { __then(); } ; })(__then); } ; })(function __$__2() { return context.lvcClient.deploy(context, __cb(_, __frame, 50, 12, __then, true)); }); }, true)); }, true)); }, true)); }, true)); } else { __then(); } ; })(_); }, true)); }, true)); }, true)); }, true)); }); });
 
 
 

diff --git a/lib/cli/commands/site_.js b/lib/cli/commands/site_.js
@@ -320,7 +320,7 @@ exports.init = function (cli) {
             if (!context.spaces) {
               context.spaces = cacheUtils.readSpaces(context, _);
               if (!context.spaces || !context.spaces.length) {
-                context.spaces = context.site.doSpacesGet(context, _);
+                context.spaces = site.doSpacesGet(context, _);
               }
             }
           }