Merge branch 'merged2' of github.com:Microsoft-Interop/azure-sdk-for-…

…node-pr into merged2
Azure · Jun 22, 2012 · 12ce628 · 12ce628
2 parents bcac85b + 04bea47
commit 12ce628
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/lib/cli/commands/vm.js b/lib/cli/commands/vm.js
@@ -1022,19 +1022,16 @@ exports.init = function(cli) {
             row.cell('VM Name', item.VMName);
             row.cell('Status', item.InstanceStatus);
           });
-        } else {
-          if (logger.format().json) {
-            logger.json([]);
-          } else {
-            logger.info('No VMs found');
-          }
+          return;
         }
-
-        cmdCallback();
+      }
+
+      if (logger.format().json) {
+        logger.json([]);
       } else {
         logger.info('No VMs found');
-        cmdCallback();
       }
+      cmdCallback();
     });
   }
 

diff --git a/lib/cli/iaas/image.js b/lib/cli/iaas/image.js
@@ -342,7 +342,7 @@ function listDisks(cli, options, cmdCallback) {
         }
       }
 
-      // got unique role under a deployment and service, list the endpoints
+      // got unique role under a deployment and service, list the disks
       if (found) {
         var osDiskName = foundDisks[0].DiskName;
         logger.verbose('Getting info for OS disk ' + osDiskName);
@@ -358,10 +358,12 @@ function listDisks(cli, options, cmdCallback) {
           });
           cmdCallback(error);
         });
-      } else {
-        cmdCallback('No VMs found');
+        return
       }
     }
+
+    progress.end();
+    cmdCallback('VM ' + options.name + ' not found');
   });
 }