This commit was generated by cvs2svn to compensate for changes in r34461,

which included commits to RCS files with non-trunk default branches.

1 files changed, 11 insertions, 2 deletions

diff --git a/contrib/cvs/src/create_adm.c b/contrib/cvs/src/create_adm.c
index c1772b2..c51785c 100644
--- a/contrib/cvs/src/create_adm.c
+++ b/contrib/cvs/src/create_adm.c
@@ -59,6 +59,12 @@ Create_Admin (dir, update_dir, repository, tag, date, nonbranch, warn)
 
     if (CVS_MKDIR (tmp, 0777) < 0)
     {
+	/* We want to print out the entire update_dir, since a lot of
+	   our code calls this function with dir == "." or dir ==
+	   NULL.  I hope that gives enough information in cases like
+	   absolute pathnames; printing out xgetwd or something would
+	   be way too verbose in the common cases.  */
+
 	if (warn)
 	{
 	    /* The reason that this is a warning, rather than silently
@@ -66,11 +72,14 @@ Create_Admin (dir, update_dir, repository, tag, date, nonbranch, warn)
 	       CVS's behavior to vary subtly based on factors (like directory
 	       permissions) which are not made clear to the user.  With
 	       the warning at least we let them know what is going on.  */
-	    error (0, errno, "warning: cannot make directory %s", tmp);
+	    error (0, errno, "warning: cannot make directory %s in %s",
+		   CVSADM, update_dir);
+	    free (tmp);
 	    return 1;
 	}
 	else
-	    error (1, errno, "cannot make directory %s", tmp);
+	    error (1, errno, "cannot make directory %s in %s",
+		   CVSADM, update_dir);
     }
 
     /* record the current cvs root for later use */