RFC: icedtea6 - fix non fatal mv warnings

[Dr Andrew John Hughes]

On 16:33 Thu 24 Feb     , Xerxes Rånby wrote:
> The attached patch fixes these non fatal icedtea6 mv warnings by correcting the code to actually check if the file exist before trying to move it.
> 
> mv: cannot stat `cacao-6a5eda011e49.tar.gz': No such file or directory
> 
> mv: cannot stat `jamvm-10329d9f3205698af125bba131b4f47339e81d90.tar.gz': No such file or directory
> 
> mv: cannot stat `openjdk-6-src-b21-20_jan_2011.tar.gz': No such file or directory
> 
> and
> 
> mv: cannot stat `hotspot.tar.gz': No such file or directory
> 
> 
> Cheers
> Xerxes
> 
> 

Sounds ok to me, but change the test to -e.  Otherwise, potentially a
directory or symbolic link could exist with that name.  The former
may not be common, but the latter is as the alt-src-zip support creates
such links.

> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am	2011-02-24 15:59:08.933380661 +0100
> +++ icedtea6/Makefile.am	2011-02-24 16:02:29.285916690 +0100
> @@ -748,7 +748,7 @@
>  	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
>  	 | $(SHA256SUM) --check ; \
>  	then \
> -	 if [ $(CACAO_SRC_ZIP) ] ; \
> +	 if [ -f $(CACAO_SRC_ZIP) ] ; \
>  	 then \
>  	   mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
>  	 fi ; \
> @@ -776,7 +776,7 @@
>  	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
>  	 | $(SHA256SUM) --check ; \
>  	then \
> -	 if [ $(JAMVM_SRC_ZIP) ] ; \
> +	 if [ -f $(JAMVM_SRC_ZIP) ] ; \
>  	 then \
>  	   mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
>  	 fi ; \
> @@ -818,7 +818,7 @@
>  	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
>  	  | $(MD5SUM) --check ; \
>  	then \
> -	  if [ $(OPENJDK_SRC_ZIP) ] ; \
> +	  if [ -f $(OPENJDK_SRC_ZIP) ] ; \
>  	  then \
>  	    mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
>  	  fi ; \
> @@ -835,7 +835,7 @@
>  	if ! echo "$${hotspot_md5sum}  $(HOTSPOT_SRC_ZIP)" \
>  	  | $(MD5SUM) --check ; \
>  	then \
> -	  if [ $(HOTSPOT_SRC_ZIP) ] ; \
> +	  if [ -f $(HOTSPOT_SRC_ZIP) ] ; \
>  	  then \
>  	    mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
>  	  fi ; \
> Index: icedtea6/ChangeLog
> ===================================================================
> --- icedtea6.orig/ChangeLog	2011-02-24 16:04:43.765910894 +0100
> +++ icedtea6/ChangeLog	2011-02-24 16:14:30.469910614 +0100
> @@ -1,3 +1,12 @@
> +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  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* patches/pr639-missing_shark_include.patch:


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37