From 245ed42ddbff8f8e16402f2938a4d365155485b0 Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <clytwynec@edx.org>
Date: Wed, 18 Jun 2014 16:30:13 -0400
Subject: [PATCH] stop update_assets commands from being called extra times

---
 pavelib/assets.py  |  5 ++++-
 pavelib/prereqs.py | 21 +++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pavelib/assets.py b/pavelib/assets.py
index 4ef79cdcb0..94abbcfd27 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -190,7 +190,10 @@ def watch_assets(options):
 
 
 @task
-@needs('pavelib.prereqs.install_asset_prereqs')
+@needs(
+    'pavelib.prereqs.install_ruby_prereqs',
+    'pavelib.prereqs.install_node_prereqs',
+)
 @consume_args
 def update_assets(args):
     """
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
index 9d7cdf4efc..c0efdff3a8 100644
--- a/pavelib/prereqs.py
+++ b/pavelib/prereqs.py
@@ -121,6 +121,9 @@ def install_ruby_prereqs():
     """
     Installs Ruby prereqs
     """
+    if os.environ.get("NO_PREREQ_INSTALL", False):
+        return
+
     prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation)
 
 
@@ -129,6 +132,9 @@ def install_node_prereqs():
     """
     Installs Node prerequisites
     """
+    if os.environ.get("NO_PREREQ_INSTALL", False):
+        return
+
     prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation)
 
 
@@ -137,6 +143,9 @@ def install_python_prereqs():
     """
     Installs Python prerequisites
     """
+    if os.environ.get("NO_PREREQ_INSTALL", False):
+        return
+
     prereq_cache("Python prereqs", PYTHON_REQ_FILES + [sysconfig.get_python_lib()], python_prereqs_installation)
 
 
@@ -151,15 +160,3 @@ def install_prereqs():
     install_ruby_prereqs()
     install_node_prereqs()
     install_python_prereqs()
-
-@task
-def install_asset_prereqs():
-    """
-    Installs Ruby and Node
-    """
-    if os.environ.get("NO_PREREQ_INSTALL", False):
-        return
-
-    install_ruby_prereqs()
-    install_node_prereqs()
-