allow conda scripts to be present when package name is conda

conda · Apr 8, 2017 · deb1cb1 · deb1cb1
1 parent 5d018f6
commit deb1cb1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/conda_build/build.py b/conda_build/build.py
@@ -678,8 +678,10 @@ def bundle_conda(output, metadata, env, **kw):
 
     files = post_process_files(metadata, initial_files)
 
-    assert 'bin/conda' not in files and 'Scripts/conda.exe' not in files, ("Bug in conda-build has "
-        "included conda binary in package.  Please report this on the conda-build issue tracker.")
+    if output.get('name') and output.get('name') != 'conda':
+        assert 'bin/conda' not in files and 'Scripts/conda.exe' not in files, ("Bug in conda-build "
+            "has included conda binary in package. Please report this on the conda-build issue "
+            "tracker.")
 
     output_filename = ('-'.join([output['name'], metadata.version(),
                                  metadata.build_id()]) + '.tar.bz2')