Revision: 2421
http://gar.svn.sourceforge.net/gar/?rev=2421&view=rev
Author: wbonnet
Date: 2008-12-01 20:16:21 +0000 (Mon, 01 Dec 2008)
Log Message:
-----------
Fix default master site and empty file list
Modified Paths:
--------------
csw/mgar/gar/v1/gar.lib.mk
Modified: csw/mgar/gar/v1/gar.lib.mk
===================================================================
--- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 18:24:02 UTC (rev 2420)
+++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:16:21 UTC (rev 2421)
@@ -105,6 +105,7 @@
# check a new upstream files are available
+UPSTREAM_MASTER_SITES ?= $(MASTER_SITES)
UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES))
ifneq ($(UFILES_REGEX), "")
FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy)
$(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix
',$(UFILES_REGEX))))
@@ -124,7 +125,7 @@
fi; \
$(MAKE) checknew-$$FILE >/dev/null; \
done; \
- if [ ! "$$NEW_FILES" -eq "" ]; then \
+ if test -z "$$NEW_FILES" ; then \
{ echo ""; \
echo "Hello dear $(GARNAME) maintainer,"; \
echo ""; \
@@ -141,7 +142,7 @@
echo "---"; \
echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification'
$(GARNAME); \
else \
- if [ ! -n "$(UFILES_REGEX)" ]; then \
+ if [ ! -n '$(UFILES_REGEX)' ]; then \
{ echo ""; \
echo "Hello dear $(GARNAME) maintainer,"; \
echo ""; \
@@ -168,13 +169,16 @@
fi; \
$(MAKE) checknew-$$FILE >/dev/null; \
done; \
- if [ ! "$$NEW_FILES" -eq "" ]; then \
- echo "$(GARNAME): new upstream files available:
$$NEW_FILES"; \
- else \
- if [ ! -n "$(UFILES_REGEX)" ]; then \
+ if test -z "$$NEW_FILES" ; then \
+ if [ ! -n '$(UFILES_REGEX)' ]; then \
echo "$(GARNAME): Warning UFILES_REGEX is not set :
$(UFILES_REGEX)" ; \
fi; \
+ else \
+ echo "$(GARNAME): new upstream files available:
$$NEW_FILES"; \
fi; \
+else \
+echo "UPSTREAM_MASTER_SITES : $(UPSTREAM_MASTER_SITES)"; \
+echo "MASTER_SITES : $(MASTER_SITES)"; \
fi
checknew-%:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
