/hg/icedtea6: Fix warnings, check if files exist before renaming.

[xranby at icedtea.classpath.org]

changeset e5b29d42117e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e5b29d42117e
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Feb 24 21:43:07 2011 +0100

	Fix warnings, check if files exist before renaming.

	2011-02-24 Xerxes Ranby <xerxes at zafena.se>

	 * Makefile.am (stamps/download-cacao.stamp): Fix
	warning, check if the CACAO_SRC_ZIP file exist before trying
	to rename it. (stamps/download-jamvm.stamp): Likewise for
	JAMVM_SRC_ZIP. (stamps/download-openjdk.stamp):
	Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.


diffstat:

2 files changed, 13 insertions(+), 4 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |    8 ++++----

diffs (55 lines):

diff -r ea1b6c251de5 -r e5b29d42117e ChangeLog
--- a/ChangeLog	Thu Feb 24 18:13:43 2011 +0100
+++ b/ChangeLog	Thu Feb 24 21:43:07 2011 +0100
@@ -1,3 +1,12 @@ 2011-02-24  Pavel Tisnovsky  <ptisnovs at r
+2011-02-24  Xerxes Ranby  <xerxes at zafena.se>
+
+	* Makefile.am (stamps/download-cacao.stamp):
+	Fix warning, check if the CACAO_SRC_ZIP file exist
+	before trying to rename it.
+	(stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP.
+	(stamps/download-openjdk.stamp):
+	Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.
+ 
 2011-02-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* patches/jtreg-png-reader.patch:
diff -r ea1b6c251de5 -r e5b29d42117e Makefile.am
--- a/Makefile.am	Thu Feb 24 18:13:43 2011 +0100
+++ b/Makefile.am	Thu Feb 24 21:43:07 2011 +0100
@@ -748,7 +748,7 @@ endif
 	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
-	 if [ $(CACAO_SRC_ZIP) ] ; \
+	 if [ -e $(CACAO_SRC_ZIP) ] ; \
 	 then \
 	   mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
 	 fi ; \
@@ -776,7 +776,7 @@ endif
 	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
-	 if [ $(JAMVM_SRC_ZIP) ] ; \
+	 if [ -e $(JAMVM_SRC_ZIP) ] ; \
 	 then \
 	   mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
 	 fi ; \
@@ -818,7 +818,7 @@ else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
 	then \
-	  if [ $(OPENJDK_SRC_ZIP) ] ; \
+	  if [ -e $(OPENJDK_SRC_ZIP) ] ; \
 	  then \
 	    mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	  fi ; \
@@ -835,7 +835,7 @@ endif
 	if ! echo "$${hotspot_md5sum}  $(HOTSPOT_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
 	then \
-	  if [ $(HOTSPOT_SRC_ZIP) ] ; \
+	  if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
 	  then \
 	    mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
 	  fi ; \