From a3bf964f96c42a794ee16c338e7ca4cc54f076bf Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 9 Nov 2013 00:17:52 +0000 Subject: [PATCH] Skip .git instead of .svn directories --- src/plugins/tool/MediaManager.py | 4 ++-- src/test/regrtest.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/tool/MediaManager.py b/src/plugins/tool/MediaManager.py index 95fc1d6b5..7d873053b 100644 --- a/src/plugins/tool/MediaManager.py +++ b/src/plugins/tool/MediaManager.py @@ -593,8 +593,8 @@ class ImagesNotIncluded(BatchOp): self.set_total(len(self.dir_list)) for directory in self.dir_list: for (dirpath, dirnames, filenames) in os.walk(directory): - if ".svn" in dirnames: - dirnames.remove('.svn') # don't visit .svn directories + if ".git" in dirnames: + dirnames.remove('.git') # don't visit .git directories for filename in filenames: media_full_path = os.path.join(dirpath, filename) if media_full_path not in self.path_list: diff --git a/src/test/regrtest.py b/src/test/regrtest.py index fb6e43de8..c9b27be31 100755 --- a/src/test/regrtest.py +++ b/src/test/regrtest.py @@ -53,7 +53,7 @@ def make_parser(): def getTestSuites(loc=gramps_root): - # in a developer's checkout, it is worth filtering-out .svn + # in a developer's checkout, it is worth filtering-out .git # and we only need to look inside test subdirs # (this might change) # this is not so performance critical that we can't afford @@ -65,9 +65,9 @@ def getTestSuites(loc=gramps_root): test_dirname = "test" test_suffix = "_test.py" def test_mod(p,ds): - """ test for path p=test dir; removes a dir '.svn' in ds """ - if ".svn" in ds: - ds.remove(".svn") + """ test for path p=test dir; removes a dir '.git' in ds """ + if ".git" in ds: + ds.remove(".git") return os.path.basename(p) == test_dirname def match_mod(fs): """ test for any test modules; deletes all non-tests """