Merge pull request #892 from ljhljh235/release-0.9.8

Fix for non-interactive scenario
Azure · Sep 11, 2015 · a07c992 · a07c992
2 parents 13e78b5 + c66a1e5
commit a07c992
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/Common/Commands.Common/AzurePSCmdlet.cs b/src/Common/Commands.Common/AzurePSCmdlet.cs
@@ -254,28 +254,27 @@ protected void SaveDataCollectionProfile()
 
         protected bool CheckIfInteractive()
         {
-            if (this.Host == null || this.Host.UI == null || this.Host.UI.RawUI == null)
-            {
-                return false;
-            }
-
             bool interactive = true;
-            try
+            if (this.Host == null || this.Host.UI == null || this.Host.UI.RawUI == null)
             {
-                var test = this.Host.UI.RawUI.KeyAvailable;
+                interactive = false;
             }
-            catch (HostException ex)
+            else
             {
-                if (ex.Message.StartsWith("A command that prompts the user failed"))
+                try
                 {
-                    interactive = false;
+                    var test = this.Host.UI.RawUI.KeyAvailable;
                 }
-                else
+                catch
                 {
-                    throw ex;
+                    interactive = false;
                 }
             }
 
+            if (!interactive && !_dataCollectionProfile.EnableAzureDataCollection.HasValue)
+            {
+                _dataCollectionProfile.EnableAzureDataCollection = false;
+            }
             return interactive;
         }
 
@@ -288,7 +287,7 @@ protected void PromptForDataCollectionProfileIfNotExists()
             // Initialize it from the environment variable or profile file.
             InitializeDataCollectionProfile();
 
-            if (CheckIfInteractive() && !_dataCollectionProfile.EnableAzureDataCollection.HasValue)
+            if (!_dataCollectionProfile.EnableAzureDataCollection.HasValue && CheckIfInteractive())
             {
                 WriteWarning(Resources.DataCollectionPrompt);