try to avoid recursion

dospromptman · Nov 26, 2018 · f3b2356 · f3b2356
1 parent 9b43d15
commit f3b2356
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cumulusci/core/config/ScratchOrgConfig.py b/cumulusci/core/config/ScratchOrgConfig.py
@@ -27,6 +27,12 @@ def scratch_info(self):
 
         self.logger.info("Getting scratch org info from Salesforce DX")
 
+        username = self.config.get("username")
+        if not username:
+            raise ScratchOrgException(
+                "Created scratch org but unable to capture username"
+            )
+
         # Call force:org:display and parse output to get instance_url and
         # access_token
         command = sarge.shell_format(
@@ -201,6 +207,8 @@ def create_org(self):
                 self.config["org_id"] = match.group(1)
                 self.config["username"] = match.group(2)
             self.logger.info(line)
+        for line in stderr:
+            self.logger.error(line)
 
         self.config["date_created"] = datetime.datetime.now()