Hostgen validation is done before populating it. This is now one sing…

…le task.
sthzg · Jul 8, 2016 · 9e808b7 · 9e808b7
1 parent 2a773e0
commit 9e808b7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/generators/activate/index.js b/generators/activate/index.js
@@ -28,9 +28,6 @@ class Generator extends generators.Base {
       cacheInstalledPackages() {
         tasks.cacheInstalledPackages(this);
       },
-      validateHostgenExists() {
-        tasks.validateHostgenExists(this);
-      },
       populateHostgenPkg() {
         tasks.populateHostgenPkg(this);
       }

diff --git a/generators/deactivate/index.js b/generators/deactivate/index.js
@@ -29,9 +29,6 @@ class Generator extends generators.Base {
       cacheInstalledPackages() {
         tasks.cacheInstalledPackages(this);
       },
-      validateHostgenExists() {
-        tasks.validateHostgenExists(this);
-      },
       populateHostgenPkg() {
         tasks.populateHostgenPkg(this);
       }

diff --git a/generators/scan/index.js b/generators/scan/index.js
@@ -26,9 +26,6 @@ class Generator extends generators.Base {
       cacheInstalledPackages() {
         tasks.cacheInstalledPackages(this);
       },
-      validateHostgenExists() {
-        tasks.validateHostgenExists(this);
-      },
       populateHostgenPkg() {
         tasks.populateHostgenPkg(this);
       }

diff --git a/utils/tasks.js b/utils/tasks.js
@@ -157,12 +157,8 @@ function validateHostgenExists(generator) {
  * @param generator
  */
 function populateHostgenPkg(generator) {
+  validateHostgenExists(generator);
   const pkgQ = utils.getPkgInfo(generator.hostFullName, generator.pkgList);
-
-  if (pkgQ.hasError) {
-    generator.env.error(`Couldn't get package info for ${generator.hostFullName} .`);
-  }
-
   generator.hostPkg = pkgQ.data.get('pkg');
 }