[csw-devel] SF.net SVN: gar:[12518] csw/mgar/gar/v2-uwatch2

[wbonnet at users.sourceforge.net]

Revision: 12518
          http://gar.svn.sourceforge.net/gar/?rev=12518&view=rev
Author:   wbonnet
Date:     2011-01-12 22:46:40 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
Tweak message

Modified Paths:
--------------
    csw/mgar/gar/v2-uwatch2/categories/cpan/category.mk
    csw/mgar/gar/v2-uwatch2/gar.lib.mk

Modified: csw/mgar/gar/v2-uwatch2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2-uwatch2/categories/cpan/category.mk	2011-01-12 21:44:39 UTC (rev 12517)
+++ csw/mgar/gar/v2-uwatch2/categories/cpan/category.mk	2011-01-12 22:46:40 UTC (rev 12518)
@@ -29,7 +29,8 @@
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX ?= $(NAME)-(\d+(?:\.\d+)*).tar.gz
-USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
+#USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
+USTREAM_MASTER_SITE = http://cpan.perl.org/modules/01modules.index.html
 
 $(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(NAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC))))
 _CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(NAME)";

Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-uwatch2/gar.lib.mk	2011-01-12 21:44:39 UTC (rev 12517)
+++ csw/mgar/gar/v2-uwatch2/gar.lib.mk	2011-01-12 22:46:40 UTC (rev 12518)
@@ -240,11 +240,11 @@
 		if [ -n "$(VERSIONLIST)" ] ; then \
 			for VERSION in $(VERSIONLIST) ""; do \
 				if [ ! "$$VERSION" -eq "" ] ; then \
-					echo "$$VERSION" ; \
+					echo "$(NAME) - $$VERSION" ; \
 				fi ; \
 			done ; \
 		else \
-			echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
+			echo "$(NAME) - No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
 		fi ; \
 	fi ;
 
@@ -270,9 +270,9 @@
 		fi; \
 		LATEST=$(LATESTVERSION) ; \
 		if [ -n "$$LATEST" ] ; then \
-			echo $$LATEST ; \
+			echo "$(NAME) - Latest upstream version is $$LATEST" ; \
 		else \
-			echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
+			echo "$(NAME) - No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
 		fi ; \
 	fi ;
 
@@ -298,7 +298,7 @@
 		fi; \
 		LATEST=$(CHECKUPSTREAMVERSION) ; \
 		if [ -n "$$LATEST" ] ; then \
-			echo "$(NAME) : a new version of upstream files is available : $$LATEST"; \
+			echo "$(NAME) : A new version of upstream files is available. Package can be upgraded from version $(VERSION) to $$LATEST"; \
 		else \
 			echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \
 		fi ; \
@@ -328,22 +328,21 @@
 		LATEST=$(CHECKUPSTREAMVERSION) ; \
 		if [ ! -f "$(COOKIEDIR)/upgrade-to-latest-upstream-$$LATEST" ] ; then \
 			if [ ! -d "../branches/upgrade_from_$(VERSION)_to_$$LATEST" ] ; then \
-				echo "Not a dir : ../branches/upgrade_from_$(VERSION)_to_$$LATEST" ; \
 				if [ -n "$$LATEST" ] ; then \
 					echo "$(NAME) : a new version of upstream files is available. Creating upgrade branch from version $(VERSION) to $$LATEST"; \
 					VERSIONUPGRADE="$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch upgrade-to-version --current-version=$(VERSION) --target-version=$(CHECKUPSTREAMVERSION))" ; \
 					if [ -n "$$VERSIONUPGRADE" ] ; then \
-						echo $$VERSIONUPGRADE ; \
+						echo "$(NAME) - $$VERSIONUPGRADE" ; \
 					fi ; \
 				else \
 					echo "$(NAME) : Package is up-to-date. Upstream site has no version newer than $(VERSION)" ; \
 				fi ; \
 			else \
-				echo "Upgrade branch from version $(VERSION) to version $$LATEST already exist" ; \
+				echo "$(NAME) - Upgrade branch from version $(VERSION) to version $$LATEST already exist" ; \
 			fi ; \
 			$(MAKE) upgrade-to-latest-upstream-$$LATEST >/dev/null; \
 		else \
-			echo "Upgrade branch to version $$LATEST already created by upstream_watch" ; \
+			echo "$(NAME) - Upgrade branch to version $$LATEST already created by upstream_watch" ; \
 		fi ; \
 	fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.