Revision: 2514
http://gar.svn.sourceforge.net/gar/?rev=2514&view=rev
Author: wbonnet
Date: 2008-12-10 22:34:46 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
Add more information to output
Modified Paths:
--------------
csw/mgar/gar/v1/gar.lib.mk
csw/mgar/gar/v2/gar.lib.mk
Modified: csw/mgar/gar/v1/gar.lib.mk
===================================================================
--- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513)
+++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514)
@@ -116,16 +116,44 @@
check-upstream-and-mail:
@if [ -n '$(FILES2CHECK)' ]; then \
NEW_FILES=""; \
+ PACKAGE_UP_TO_DATE=0; \
for FILE in $(FILES2CHECK) ""; do \
[ -n "$$FILE" ] || continue; \
- if test -f $(COOKIEDIR)/checknew-$$FILE || echo
$(DISTFILES) | grep -w $$FILE >/dev/null; then \
- : ; \
+ if test -f $(COOKIEDIR)/checknew-$$FILE ; then \
+ PACKAGE_UP_TO_DATE=1; \
else \
- NEW_FILES="$$FILE $$NEW_FILES"; \
+ if echo $(DISTFILES) | grep -w $$FILE
>/dev/null; then \
+ PACKAGE_UP_TO_DATE=1; \
+ echo "$(GARNAME) : Package is up-to-date. Current
version is $$FILE" ; \
+ else \
+ NEW_FILES="$$FILE $$NEW_FILES"; \
+ fi; \
fi; \
$(MAKE) checknew-$$FILE >/dev/null; \
done; \
if test -z "$$NEW_FILES" ; then \
+ if [ ! -n '$(UFILES_REGEX)' ]; then \
+ echo "$(GARNAME) : Warning UFILES_REGEX is not set :
$(UFILES_REGEX)" ; \
+# { echo ""; \
+# echo "Hello dear $(GARNAME) maintainer,"; \
+# echo ""; \
+# echo "The upstream notification job has
detected that $(GARNAME) is not configured for automatic upstream file update
detection."; \
+# echo ""; \
+# echo "Please consider updating your package.
Documentation is available from this link : http://www.opencsw.org"; ; \
+# echo ""; \
+# echo "---"; \
+# echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
+ else \
+ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \
+ echo "$(GARNAME) : Warning no files to
check ! $(FILES2CHECK)" ; \
+ echo "$(GARNAME) :
UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
+ echo "$(GARNAME) : DISTNAME is
$(DISTNAME)" ; \
+ echo "$(GARNAME) : UFILES_REGEX is
: $(UFILES_REGEX)" ; \
+ echo "$(GARNAME) : Please check
configuration" ; \
+ fi; \
+ fi; \
+ else \
+ echo "$(GARNAME) : new upstream files available:
$$NEW_FILES"; \
{ echo ""; \
echo "Hello dear $(GARNAME) maintainer,"; \
echo ""; \
@@ -141,19 +169,7 @@
echo ""; \
echo "---"; \
echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
- else \
-# if [ ! -n '$(UFILES_REGEX)' ]; then \
-# { echo ""; \
-# echo "Hello dear $(GARNAME) maintainer,"; \
-# echo ""; \
-# echo "The upstream notification job has
detected that $(GARNAME) is not configured for automatic upstream file update
detection."; \
-# echo ""; \
-# echo "Please consider updating your package.
Documentation is available from this link : http://www.opencsw.org"; ; \
-# echo ""; \
-# echo "---"; \
-# echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
-# fi; \
- fi; \
+ fi; \
fi
check-upstream:
Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513)
+++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514)
@@ -114,16 +114,44 @@
check-upstream-and-mail:
@if [ -n '$(FILES2CHECK)' ]; then \
NEW_FILES=""; \
+ PACKAGE_UP_TO_DATE=0; \
for FILE in $(FILES2CHECK) ""; do \
[ -n "$$FILE" ] || continue; \
- if test -f $(COOKIEDIR)/checknew-$$FILE || echo
$(DISTFILES) | grep -w $$FILE >/dev/null; then \
- : ; \
+ if test -f $(COOKIEDIR)/checknew-$$FILE ; then \
+ PACKAGE_UP_TO_DATE=1; \
else \
- NEW_FILES="$$FILE $$NEW_FILES"; \
+ if echo $(DISTFILES) | grep -w $$FILE
>/dev/null; then \
+ PACKAGE_UP_TO_DATE=1; \
+ echo "$(GARNAME) : Package is up-to-date. Current
version is $$FILE" ; \
+ else \
+ NEW_FILES="$$FILE $$NEW_FILES"; \
+ fi; \
fi; \
$(MAKE) checknew-$$FILE >/dev/null; \
done; \
if test -z "$$NEW_FILES" ; then \
+ if [ ! -n '$(UFILES_REGEX)' ]; then \
+ echo "$(GARNAME) : Warning UFILES_REGEX is not set :
$(UFILES_REGEX)" ; \
+# { echo ""; \
+# echo "Hello dear $(GARNAME) maintainer,"; \
+# echo ""; \
+# echo "The upstream notification job has
detected that $(GARNAME) is not configured for automatic upstream file update
detection."; \
+# echo ""; \
+# echo "Please consider updating your package.
Documentation is available from this link : http://www.opencsw.org"; ; \
+# echo ""; \
+# echo "---"; \
+# echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
+ else \
+ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \
+ echo "$(GARNAME) : Warning no files to
check ! $(FILES2CHECK)" ; \
+ echo "$(GARNAME) :
UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
+ echo "$(GARNAME) : DISTNAME is
$(DISTNAME)" ; \
+ echo "$(GARNAME) : UFILES_REGEX is
: $(UFILES_REGEX)" ; \
+ echo "$(GARNAME) : Please check
configuration" ; \
+ fi; \
+ fi; \
+ else \
+ echo "$(GARNAME) : new upstream files available:
$$NEW_FILES"; \
{ echo ""; \
echo "Hello dear $(GARNAME) maintainer,"; \
echo ""; \
@@ -139,21 +167,9 @@
echo ""; \
echo "---"; \
echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
- else \
-# if [ ! -n '$(UFILES_REGEX)' ]; then \
-# { echo ""; \
-# echo "Hello dear $(GARNAME) maintainer,"; \
-# echo ""; \
-# echo "The upstream notification job has
detected that $(GARNAME) is not configured for automatic upstream file update
detection."; \
-# echo ""; \
-# echo "Please consider updating your package.
Documentation is available from this link : http://www.opencsw.org"; ; \
-# echo ""; \
-# echo "---"; \
-# echo "upstream notification job"; } |
$(GARBIN)/mail2maintainer -b [EMAIL PROTECTED] -s '[svn] $(GARNAME) upstream
update notification' $(GARNAME); \
-# fi; \
- fi; \
+ fi; \
fi
-
+
check-upstream:
@if [ -n '$(FILES2CHECK)' ]; then \
NEW_FILES=""; \
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
