summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2015-08-24 14:43:45 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-08-25 05:40:46 +0000
commitdc2545cad60d7e8bae894f5d60eaeb3cff7485ae (patch)
tree3f26eeb07cbbe3aa069b600cd9daf361c8b904c6 /project.py
parentf33929d014c21eaabb5471a70abf698af7742b8c (diff)
downloadgit-repo-dc2545cad60d7e8bae894f5d60eaeb3cff7485ae.tar.gz
project.py: Improve message shown when hook is not replaced
If a hook file has been modified locally, it will not be replaced. Improve the message to make this clearer. Also change it from an error to a warning. Change-Id: I62c635390f24d2868db17717c247861b0381c99f
Diffstat (limited to 'project.py')
-rw-r--r--project.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/project.py b/project.py
index 4f2b203a..a8d012d2 100644
--- a/project.py
+++ b/project.py
@@ -2227,7 +2227,7 @@ class Project(object):
2227 if filecmp.cmp(stock_hook, dst, shallow=False): 2227 if filecmp.cmp(stock_hook, dst, shallow=False):
2228 os.remove(dst) 2228 os.remove(dst)
2229 else: 2229 else:
2230 _error("%s: Not replacing %s hook", self.relpath, name) 2230 _warn("%s: Not replacing locally modified %s hook", self.relpath, name)
2231 continue 2231 continue
2232 try: 2232 try:
2233 os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst) 2233 os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst)