commit dc2545cad60d7e8bae894f5d60eaeb3cff7485ae
author David Pursehouse <david.pursehouse@sonymobile.com> Mon Aug 24 14:43:45 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Tue Aug 25 05:40:46 2015 +0000
tree 3f26eeb07cbbe3aa069b600cd9daf361c8b904c6
parent f33929d014c21eaabb5471a70abf698af7742b8c

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

project.py

diff --git a/project.py b/project.py
index 4f2b203..a8d012d 100644
--- a/project.py
+++ b/project.py
@@ -2227,7 +2227,7 @@
         if filecmp.cmp(stock_hook, dst, shallow=False):
           os.remove(dst)
         else:
-          _error("%s: Not replacing %s hook", self.relpath, name)
+          _warn("%s: Not replacing locally modified %s hook", self.relpath, name)
           continue
       try:
         os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst)