# HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1228079196 -3600
# Node ID c5f010a5647a60db355859c47befaa6716479c08
# Parent 0c5dd7ceda033c6e2292d1c220c15b38291476fd
Improve unify-sources.sh (#186)
Errors can also be accepted when the script is used as a hg hook.
Sometimes it is useful (e.g. if someone else made the errors).
diff --git a/scripts/unify-sources.sh b/scripts/unify-sources.sh
a
|
b
|
|
130 | 130 | echo $FAILED_FILES out of $TOTAL_FILES files has been failed. |
131 | 131 | echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings. |
132 | 132 | |
133 | | if [ $FAILED_FILES -gt 0 ] |
134 | | then |
135 | | return 1 |
136 | | elif [ $WARNED_FILES -gt 0 ] |
| 133 | if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ] |
137 | 134 | then |
138 | 135 | if [ "$WARNING" == 'INTERACTIVE' ] |
139 | 136 | then |
140 | | echo -n "Are the files with warnings acceptable? (yes/no) " |
| 137 | echo -n "Are the files with errors/warnings acceptable? (yes/no) " |
141 | 138 | while read answer |
142 | 139 | do |
143 | 140 | if [ "$answer" == 'yes' ] |
… |
… |
|
147 | 144 | then |
148 | 145 | return 1 |
149 | 146 | fi |
150 | | echo -n "Are the files with warnings acceptable? (yes/no) " |
| 147 | echo -n "Are the files with errors/warnings acceptable? (yes/no) " |
151 | 148 | done |
152 | 149 | elif [ "$WARNING" == 'WERROR' ] |
153 | 150 | then |