From 34706d6acfe39d6d8145111cf9009e43a751e322 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 3 Aug 2012 16:56:00 -0700 Subject: [PATCH] Moved setting up eclipse to setup_mcp --- fml/install/fml.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fml/install/fml.py b/fml/install/fml.py index ebd4c4c55..460220258 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -295,10 +295,6 @@ def finish_setup_fml(fml_dir, mcp_dir): updatemd5(None, True) reset_logger() os.chdir(fml_dir) - - #update workspace - print 'Fixing MCP Workspace' - merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse')) def apply_patches(mcp_dir, patch_dir, target_dir, find=None, rep=None): sys.path.append(mcp_dir) @@ -475,3 +471,7 @@ def setup_mcp(fml_dir, mcp_dir): if os.path.isfile(temp): os.remove(temp) + + #update workspace + print 'Fixing MCP Workspace' + merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse'))