From 11d374efe3957ff5648c5d5e3103b855df442a0d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 26 Feb 2003 10:46:10 +0000
Subject: [PATCH] Merge fix for bug 17365 from HEAD

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274182 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/taskdefs/AbstractCvsTask.java   | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index 93aa3342c..a2c1297e0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -276,24 +276,35 @@ public abstract class AbstractCvsTask extends Task {
          * Need a better cross platform integration with <cvspass>, so
          * use the same filename.
          */
-        if(passFile == null) {
+        if (passFile == null) {
 
             File defaultPassFile = new File(
                 System.getProperty("cygwin.user.home",
                     System.getProperty("user.home")) 
                 + File.separatorChar + ".cvspass");
 
-            if(defaultPassFile.exists())
+            if(defaultPassFile.exists()) {
                 this.setPassfile(defaultPassFile);
+            }
         }
 
         if (passFile != null) {
-            Environment.Variable var = new Environment.Variable();
-            var.setKey("CVS_PASSFILE");
-            var.setValue(String.valueOf(passFile));
-            env.addVariable(var);
-            log("Using cvs passfile: " + String.valueOf(passFile), 
-                Project.MSG_INFO);
+            if (passFile.isFile() && passFile.canRead()) {
+                Environment.Variable var = new Environment.Variable();
+                var.setKey("CVS_PASSFILE");
+                var.setValue(String.valueOf(passFile));
+                env.addVariable(var);
+                log("Using cvs passfile: " + String.valueOf(passFile), 
+                    Project.MSG_INFO);
+            } else if (!passFile.canRead()) {
+                log("cvs passfile: " + String.valueOf(passFile)
+                    + " ignored as it is not readable",
+                    Project.MSG_WARN);
+            } else {
+                log("cvs passfile: " + String.valueOf(passFile)
+                    + " ignored as it is not a file",
+                    Project.MSG_WARN);
+            }
         }
 
         if (cvsRsh != null) {