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

[wbonnet at users.sourceforge.net]

Revision: 12270
          http://gar.svn.sourceforge.net/gar/?rev=12270&view=rev
Author:   wbonnet
Date:     2011-01-08 23:48:47 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
Remove extra empty line in get-upstream-version-list

Modified Paths:
--------------
    csw/mgar/gar/v2-uwatch2/bin/upstream_watch
    csw/mgar/gar/v2-uwatch2/gar.lib.mk

Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch
===================================================================
--- csw/mgar/gar/v2-uwatch2/bin/upstream_watch	2011-01-08 23:13:48 UTC (rev 12269)
+++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch	2011-01-08 23:48:47 UTC (rev 12270)
@@ -618,6 +618,7 @@
                 myList = []
                 for version in matches:
                     myList.append(version)
+
                 l = list(set(myList))
                 l.sort(self.compareAndSortVersion)
 

Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-uwatch2/gar.lib.mk	2011-01-08 23:13:48 UTC (rev 12269)
+++ csw/mgar/gar/v2-uwatch2/gar.lib.mk	2011-01-08 23:48:47 UTC (rev 12270)
@@ -220,7 +220,7 @@
 ########################################################
 # Retrieve the list of upstream versions
 #
-get-upstream-version-list:VERSIONLIST = $(call versionlist)
+get-upstream-version-list: VERSIONLIST = $(call versionlist)
 get-upstream-version-list:
 	@if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \
 		echo "$(NAME) - Upstream Watch is disabled" ; \
@@ -239,7 +239,9 @@
 		fi; \
 		if [ -n "$(VERSIONLIST)" ] ; then \
 			for VERSION in $(VERSIONLIST) ""; do \
-				echo $$VERSION ; \
+				if [ ! "$$VERSION" -eq "" ] ; then \
+					echo "$$VERSION" ; \
+				fi ; \
 			done ; \
 		else \
 			echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
@@ -307,7 +309,8 @@
 # Create upgrade branch from current to latest upstream
 #
 upgrade-to-latest-upstream:
-	@if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \
+	@echo "In upgrade-to-latest-upstream" ; \
+	if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \
 		echo "$(NAME) - Upstream Watch is disabled" ; \
 	else \
 		if [ ! -n '$(UFILES_REGEX)' ]; then \


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