Commit 86818e5b authored by Jérome Perrin's avatar Jérome Perrin Committed by Godefroid Chapelle

ignore git when computing signature of a recipe develop egg

When a recipe is developed in a git working copy, .git administrative
database folder should be ignored, like we did with CVS and svn.

fixes #522
parent f5eec302
...@@ -1835,7 +1835,7 @@ def _open(base, filename, seen, dl_options, override, downloaded): ...@@ -1835,7 +1835,7 @@ def _open(base, filename, seen, dl_options, override, downloaded):
return result return result
ignore_directories = '.svn', 'CVS', '__pycache__' ignore_directories = '.svn', 'CVS', '__pycache__', '.git'
_dir_hashes = {} _dir_hashes = {}
def _dir_hash(dir): def _dir_hash(dir):
dir_hash = _dir_hashes.get(dir, None) dir_hash = _dir_hashes.get(dir, None)
......
...@@ -1236,7 +1236,7 @@ def changes_in_svn_or_CVS_dont_affect_sig(): ...@@ -1236,7 +1236,7 @@ def changes_in_svn_or_CVS_dont_affect_sig():
""" """
If we have a develop recipe, it's signature shouldn't be affected to If we have a develop recipe, it's signature shouldn't be affected to
changes in .svn or CVS directories. changes in .git, .svn or CVS directories.
>>> mkdir('recipe') >>> mkdir('recipe')
>>> write('recipe', 'setup.py', >>> write('recipe', 'setup.py',
...@@ -1268,12 +1268,14 @@ changes in .svn or CVS directories. ...@@ -1268,12 +1268,14 @@ changes in .svn or CVS directories.
Develop: '/sample-buildout/recipe' Develop: '/sample-buildout/recipe'
Installing foo. Installing foo.
>>> mkdir('recipe', '.git')
>>> mkdir('recipe', '.svn') >>> mkdir('recipe', '.svn')
>>> mkdir('recipe', 'CVS') >>> mkdir('recipe', 'CVS')
>>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='') >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
Develop: '/sample-buildout/recipe' Develop: '/sample-buildout/recipe'
Updating foo. Updating foo.
>>> write('recipe', '.git', 'x', '1')
>>> write('recipe', '.svn', 'x', '1') >>> write('recipe', '.svn', 'x', '1')
>>> write('recipe', 'CVS', 'x', '1') >>> write('recipe', 'CVS', 'x', '1')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment