From 645c30afee595dd000228e7eeee3ba111a777fd6 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Mon, 13 Aug 2018 18:41:14 -0700 Subject: [PATCH] Better naming of paths. --- git_archive_all.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/git_archive_all.py b/git_archive_all.py index f404ffd..5c0ffd2 100755 --- a/git_archive_all.py +++ b/git_archive_all.py @@ -245,18 +245,18 @@ def walk_git_files(self, repo_path=''): m = re.match("^\s*path\s*=\s*(.*)\s*$", l) if m: - submodule_path = m.group(1) - submodule_abspath = path.join(repo_path, submodule_path) + repo_submodule_path = m.group(1) # relative to repo_path + main_repo_submodule_path = path.join(repo_path, repo_submodule_path) # relative to main_repo_abspath - if self.is_file_excluded(repo_abspath, submodule_path): + if self.is_file_excluded(repo_abspath, repo_submodule_path): continue - for submodule_file_path in self.walk_git_files(submodule_abspath): - rel_file_path = submodule_file_path.replace(repo_path, "", 1).strip("/") - if self.is_file_excluded(repo_abspath, rel_file_path): + for main_repo_submodule_file_path in self.walk_git_files(main_repo_submodule_path): + repo_submodule_file_path = main_repo_submodule_file_path.replace(repo_path, "", 1).strip("/") + if self.is_file_excluded(repo_abspath, repo_submodule_file_path): continue - yield submodule_file_path + yield main_repo_submodule_file_path except IOError: pass