From 67124b4fcc67ffb014617e2a35357c3c3fb7b08b Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 9 Jan 2015 14:02:39 -0800
Subject: [PATCH] remove strict arg from css_js_prerelease

---
 setup.py     | 7 +++----
 setupbase.py | 9 +++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 1c889ee37..31c473057 100755
--- a/setup.py
+++ b/setup.py
@@ -214,9 +214,8 @@ class UploadWindowsInstallers(upload):
 
 setup_args['cmdclass'] = {
     'build_py': css_js_prerelease(
-            check_package_data_first(git_prebuild('IPython')),
-        strict=False),
-    'sdist' : css_js_prerelease(git_prebuild('IPython', sdist), strict=False),
+            check_package_data_first(git_prebuild('IPython'))),
+    'sdist' : css_js_prerelease(git_prebuild('IPython', sdist)),
     'upload_wininst' : UploadWindowsInstallers,
     'submodule' : UpdateSubmodules,
     'css' : CompileCSS,
@@ -284,7 +283,7 @@ if 'setuptools' in sys.modules:
     # setup.py develop should check for submodules
     from setuptools.command.develop import develop
     setup_args['cmdclass']['develop'] = require_submodules(develop)
-    setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel(), strict=False)
+    setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel())
     
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
diff --git a/setupbase.py b/setupbase.py
index a4e0d98d1..c8c0f62ab 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -746,7 +746,7 @@ class JavascriptVersion(Command):
                 f.write(line)
 
 
-def css_js_prerelease(command, strict=True):
+def css_js_prerelease(command):
     """decorator for building js/minified css prior to a release"""
     class DecoratedCommand(command):
         def run(self):
@@ -756,10 +756,7 @@ def css_js_prerelease(command, strict=True):
             try:
                 self.distribution.run_command('css')
             except Exception as e:
-                if strict:
-                    raise
-                else:
-                    log.warn("rebuilding css and sourcemaps failed (not a problem)")
-                    log.warn(str(e))
+                log.warn("rebuilding css and sourcemaps failed (not a problem)")
+                log.warn(str(e))
             command.run(self)
     return DecoratedCommand