зеркало из https://github.com/mozilla/pjs.git
Backing the egrep part of slamm's change out, solaris egrep doesn't know what -q is
This commit is contained in:
Родитель
2233b27038
Коммит
550e83cf8b
|
@ -204,10 +204,10 @@ checkout:
|
|||
@date > $(CVSCO_LOGFILE)
|
||||
cd $(ROOTDIR) && \
|
||||
$(CVSCO) SeaMonkeyEditor | tee -a $(CVSCO_LOGFILE)
|
||||
@if egrep -q "^C " $(CVSCO_LOGFILE) ; then \
|
||||
echo "$(MAKE): *** Conflicts during checkout. \
|
||||
Refer to $(CVSCO_LOGFILE)."; \
|
||||
exit 1; \
|
||||
# @if egrep -q "^C " $(CVSCO_LOGFILE) ; then \
|
||||
# echo "$(MAKE): *** Conflicts during checkout. \
|
||||
# Refer to $(CVSCO_LOGFILE)."; \
|
||||
# exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче