提交 279dc9ab 编写于 作者: W wuzewu

Fix bug

上级 bb219d50
...@@ -125,8 +125,6 @@ class ShowCommand(BaseCommand): ...@@ -125,8 +125,6 @@ class ShowCommand(BaseCommand):
cwd = os.getcwd() cwd = os.getcwd()
module_dir = default_module_manager.search_module(module_name) module_dir = default_module_manager.search_module(module_name)
module_dir = (os.path.join(cwd, module_name),
None) if not module_dir else module_dir
if not module_dir or not os.path.exists(module_dir[0]): if not module_dir or not os.path.exists(module_dir[0]):
print("%s is not existed!" % module_name) print("%s is not existed!" % module_name)
return True return True
......
...@@ -85,6 +85,7 @@ class LocalModuleManager(object): ...@@ -85,6 +85,7 @@ class LocalModuleManager(object):
upgrade=False, upgrade=False,
extra=None): extra=None):
md5_value = installed_module_version = None md5_value = installed_module_version = None
from_user_dir = True if module_dir else False
if module_name: if module_name:
self.all_modules(update=True) self.all_modules(update=True)
module_info = self.modules_dict.get(module_name, None) module_info = self.modules_dict.get(module_name, None)
...@@ -135,6 +136,7 @@ class LocalModuleManager(object): ...@@ -135,6 +136,7 @@ class LocalModuleManager(object):
size = len(file_names) - 1 size = len(file_names) - 1
module_dir = os.path.split(file_names[0])[0] module_dir = os.path.split(file_names[0])[0]
module_dir = os.path.join(hub.CACHE_HOME, module_dir) module_dir = os.path.join(hub.CACHE_HOME, module_dir)
# remove cache
if os.path.exists(module_dir): if os.path.exists(module_dir):
shutil.rmtree(module_dir) shutil.rmtree(module_dir)
for index, file_name in enumerate(file_names): for index, file_name in enumerate(file_names):
...@@ -160,7 +162,10 @@ class LocalModuleManager(object): ...@@ -160,7 +162,10 @@ class LocalModuleManager(object):
fp.write(md5_value) fp.write(md5_value)
save_path = os.path.join(MODULE_HOME, module_name) save_path = os.path.join(MODULE_HOME, module_name)
if os.path.exists(save_path): if os.path.exists(save_path):
shutil.rmtree(save_path) shutil.move(save_path)
if from_user_dir:
shutil.copytree(module_dir, save_path)
else:
shutil.move(module_dir, save_path) shutil.move(module_dir, save_path)
module_dir = save_path module_dir = save_path
tips = "Successfully installed %s" % module_name tips = "Successfully installed %s" % module_name
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册