[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Slightly improved "Bad CVSROOT" message
From: |
Alexey Mahotkin |
Subject: |
Slightly improved "Bad CVSROOT" message |
Date: |
Fri, 8 Jun 2001 23:10:13 +0400 (MSD) |
Hello,
this patch slightly improves "Bad CVSROOT" message towards clear
specification of which particular CVSROOT is bad. Patch to test-case
included.
diff -ur /home/alexm/tmp/cvs-dist/cvs-1.11.1/src/main.c ./src/main.c
--- /home/alexm/tmp/cvs-dist/cvs-1.11.1/src/main.c Sun Jun 3 13:47:09 2001
+++ ./src/main.c Fri Jun 8 23:06:06 2001
@@ -894,7 +894,7 @@
if (current_parsed_root != NULL)
free_cvsroot_t (current_parsed_root);
if ((current_parsed_root = parse_cvsroot (current_root)) ==
NULL)
- error (1, 0, "Bad CVSROOT.");
+ error (1, 0, "Bad CVSROOT: '%s'.", current_root);
if (trace)
fprintf (stderr, "%s-> main loop with CVSROOT=%s\n",
Only in ./src: main.c~
diff -ur /home/alexm/tmp/cvs-dist/cvs-1.11.1/src/sanity.sh ./src/sanity.sh
--- /home/alexm/tmp/cvs-dist/cvs-1.11.1/src/sanity.sh Thu Apr 26 02:30:56 2001
+++ ./src/sanity.sh Fri Jun 8 23:06:44 2001
@@ -15597,7 +15597,7 @@
"${PROG} [a-z]*: CVSROOT (\":ext:${hostname}:\.\./crerepos\")
${PROG} [a-z]*: may only specify a positive, non-zero, integer port (not
\"\.\.\")\.
${PROG} [a-z]*: perhaps you entered a relative pathname${QUESTION}
-${PROG} \[[a-z]* aborted\]: Bad CVSROOT\."
+${PROG} \[[a-z]* aborted\]: Bad CVSROOT: '[^\']*\."
cd ..
rm -r 1
@@ -15608,7 +15608,7 @@
${PROG} [a-z]*: requires a path spec
${PROG} [a-z]*:
:(gserver|kserver|pserver):\[\[user\]\[:password\]@\]host\[:\[port\]\]/path
${PROG} [a-z]*: \[:(ext|server):\]\[\[user\]@\]host\[:\]/path
-${PROG} \[[a-z]* aborted\]: Bad CVSROOT\."
+${PROG} \[[a-z]* aborted\]: Bad CVSROOT: '[^\']*\."
cd ..
rm -r 1
else # local
@@ -15623,7 +15623,7 @@
mkdir 1; cd 1
dotest_fail crerepos-6b "${testcvs} -d crerepos init" \
"${PROG} [a-z]*: CVSROOT \"crerepos\" must be an absolute pathname
-${PROG} \[[a-z]* aborted\]: Bad CVSROOT\."
+${PROG} \[[a-z]* aborted\]: Bad CVSROOT: '[^\']*\."
cd ..
rm -r 1
fi # end of tests to be skipped for remote
--alexm
- Slightly improved "Bad CVSROOT" message,
Alexey Mahotkin <=