From 86c4cbe57c3c1cdc460237a279ae74c4d7a303f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Wed, 25 Apr 2018 14:45:18 +0200 Subject: [PATCH] Tentative windows compatibility --- setuptools_odoo/git_file_finder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setuptools_odoo/git_file_finder.py b/setuptools_odoo/git_file_finder.py index 887fc48b..4c5bf200 100644 --- a/setuptools_odoo/git_file_finder.py +++ b/setuptools_odoo/git_file_finder.py @@ -20,17 +20,17 @@ def _git_toplevel(path): def _git_ls_files_and_dirs(toplevel): # use git archive instead of git ls-file to honor # export-ignore git attribute - prefix = os.path.join(toplevel, '') - cmd = ['git', 'archive', '--prefix', prefix, 'HEAD'] + cmd = ['git', 'archive', '--prefix', toplevel + os.path.sep, 'HEAD'] proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, cwd=toplevel) tf = tarfile.open(fileobj=proc.stdout, mode='r|*') git_files = set() git_dirs = set([toplevel]) for member in tf.getmembers(): + name = member.name.replace('/', os.path.sep) if member.type == tarfile.DIRTYPE: - git_dirs.add(member.name) + git_dirs.add(name) else: - git_files.add(member.name) + git_files.add(name) return git_files, git_dirs