Revision: 12553
http://gar.svn.sourceforge.net/gar/?rev=12553&view=rev
Author: wbonnet
Date: 2011-01-15 23:42:07 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
Fix sql date and return value check
Modified Paths:
--------------
csw/mgar/gar/v2-uwatch2/gar.lib.mk
Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-15 23:08:02 UTC (rev 12552)
+++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-15 23:42:07 UTC (rev 12553)
@@ -398,8 +398,9 @@
########################################################
# Create upgrade branch from current to latest upstream
#
+report-package-version:PACKAGELIST=$(foreach SPEC,$(SPKG_SPECS),echo "$(call
_pkglist_one,$(SPEC))")
report-package-version:
- if [ '$(ENABLE_UWATCH)' -ne '1' ] ; then \
+ @if [ '$(ENABLE_UWATCH)' -ne '1' ] ; then \
echo "$(NAME) - Upstream Watch is disabled" ; \
else \
UWATCHCONFCHECK="Ok" ; \
@@ -425,17 +426,20 @@
exit 1 ; \
fi; \
EXECUTIONDATE=`date +"%Y-%m-%d %H:%M:%S"` ; \
- REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy)
$(GARBIN)/uwatch report-package-version --catalog-name=firefox
--package-name=CSWthunderbird --execution-date="$$EXECUTIONDATE"
--gar-path=pkg/thunderbird/trunk --gar-version=$(VERSION)
--upstream-version=$$LATEST --database-host=hastur --database-user=root
--database-password=root --database-schema=spmtcsw"` ; \
- if [ "$$?" -ne "0" ] ; then \
- echo "Error occured while executing uwatch. Please
check configuration with target get-uwatch-configuration. Here is the output of
uwatch command :" ; \
- echo "$$REPORTVERSION" ; \
- exit 1 ; \
- fi; \
+ $(PACKAGELIST) | while read GARPATH CATALOGNAME PKGNAME ; do \
+ REPORTVERSION=`http_proxy=$(http_proxy)
ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch report-package-version
--catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME"
--execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH"
--gar-version=$(VERSION) --upstream-version=$$LATEST"` ; \
+ if [ "$$?" -ne "0" ] ; then \
+ echo "Error occured while executing uwatch.
Please check configuration with target get-uwatch-configuration. Here is the
output of uwatch command :" ; \
+ echo "$$REPORTVERSION" ; \
+ exit 1 ; \
+ fi; \
+ done ; \
if [ -n "$$REPORTVERSION" ] ; then \
echo "$(NAME) - $$REPORTVERSION" ; \
fi ; \
fi
+#
########################################################
#
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
