Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip .git instead of .svn directories

Browse Source
This commit is contained in:
Nick Hall 2013-11-09 00:10:46 +00:00
parent 57daf4f269
commit 9050f96dad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/plugins/tool/mediamanager.py
View File

@ -672,8 +672,8 @@ class ImagesNotIncluded(BatchOp):
self.set_total(len(self.dir_list)) self.set_total(len(self.dir_list))
for directory in self.dir_list: for directory in self.dir_list:
for (dirpath, dirnames, filenames) in os.walk(directory): for (dirpath, dirnames, filenames) in os.walk(directory):
if ".svn" in dirnames: if ".git" in dirnames:
dirnames.remove('.svn') # don't visit .svn directories dirnames.remove('.git') # don't visit .git directories
for filename in filenames: for filename in filenames:
media_full_path = os.path.join(dirpath, filename) media_full_path = os.path.join(dirpath, filename)
if media_full_path not in self.path_list: if media_full_path not in self.path_list:

8
gramps/test/regrtest.py
View File

@ -53,7 +53,7 @@ def make_parser():
def getTestSuites(loc=gramps_root): 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 # and we only need to look inside test subdirs
# (this might change) # (this might change)
# this is not so performance critical that we can't afford # this is not so performance critical that we can't afford
@ -65,9 +65,9 @@ def getTestSuites(loc=gramps_root):
test_dirname = "test" test_dirname = "test"
test_suffix = "_test.py" test_suffix = "_test.py"
def test_mod(p,ds): def test_mod(p,ds):
""" test for path p=test dir; removes a dir '.svn' in ds """ """ test for path p=test dir; removes a dir '.git' in ds """
if ".svn" in ds: if ".git" in ds:
ds.remove(".svn") ds.remove(".git")
return os.path.basename(p) == test_dirname return os.path.basename(p) == test_dirname
def match_mod(fs): def match_mod(fs):
""" test for any test modules; deletes all non-tests """ """ test for any test modules; deletes all non-tests """