conda: clean up paths for installation

cctbx · Mar 1, 2022 · 5e0d231 · 5e0d231
1 parent 2101393
commit 5e0d231
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libtbx/auto_build/conda_build/install_build.py b/libtbx/auto_build/conda_build/install_build.py
@@ -281,6 +281,9 @@ def copy_modules(env, sp_dir=None, link=False):
                 dst = os.path.join(sp_dir, 'phenix', subdir)
                 print('  source:      ' + src)
                 print('  destination: ' + dst)
+                if os.path.exists(dst):
+                  print('  {dst} already exists'.format(dst=dst))
+                  continue
                 copy_cmd(src, dst, link)
             continue
           elif module in ['elbow', 'phaser', 'phasertng', 'PyQuante']:

diff --git a/libtbx/env_config.py b/libtbx/env_config.py
@@ -1651,7 +1651,7 @@ def write_dispatcher(self,
           + "   =%s\n" % reg
           + "    %s\n" % show_string(abs(source_file))
           + "   =%s" % source_file)
-    if abs(self.build_path) == get_conda_prefix() or \
+    if abs(self.build_path) == os.path.abspath(get_conda_prefix()) or \
       (os.name == "nt" and abs(self.build_path).lower().endswith('library')):
       action = self.write_conda_dispatcher
     elif (os.name == "nt"):