OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Oct-2005 17:26:07
Branch: HEAD Handle: 2005100316260700
Modified files:
openpkg-src/cvs cvs.patch.rse
Log:
even more bugfixing to the CVSROOT fiddling. The problem is that CVS
1.12.x recently completely changed its internal CVSROOT handling :-(
Summary:
Revision Changes Path
1.21 +19 -17 openpkg-src/cvs/cvs.patch.rse
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.20 -r1.21 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 3 Oct 2005 15:12:36 -0000 1.20
+++ openpkg-src/cvs/cvs.patch.rse 3 Oct 2005 15:26:07 -0000 1.21
@@ -1511,7 +1511,7 @@
retrieving revision 1.1.1.18
diff -u -d -r1.1.1.18 main.c
--- src/main.c 17 Mar 2005 19:42:23 -0000 1.1.1.18
-+++ src/main.c 3 Oct 2005 15:06:03 -0000
++++ src/main.c 3 Oct 2005 15:24:28 -0000
@@ -26,6 +26,10 @@
const char *program_path;
const char *cvs_cmd_name;
@@ -2055,7 +2055,7 @@
{
/* First check if a root was set via the command line. */
if (CVSroot_cmdline)
-@@ -907,6 +1286,52 @@
+@@ -907,6 +1286,54 @@
error (1, 0,
"or set the %s environment variable.", CVSROOT_ENV);
}
@@ -2072,9 +2072,10 @@
+ fprintf(stderr, "%s: switching to MASTER
location of repository `%s'\n", program_name, e->nickname);
+ fprintf(stderr, "%s: %s <-- %s\n",
program_name, e->masterpath, e->slavepath);
+ }
-+ if (CVSroot_parsed->original != NULL)
-+ free(CVSroot_parsed->original);
-+ CVSroot_parsed->original = xstrdup(e->masterpath);
++ if (CVSroot_parsed != NULL)
++ free_cvsroot_t(CVSroot_parsed);
++ if (!(CVSroot_parsed = parse_cvsroot (e->masterpath)))
++ error (1, 0, "Bad CVSROOT: `%s'.", e->masterpath);
+ if (CVSroot_cmdline != NULL)
+ free(CVSroot_cmdline);
+ CVSroot_cmdline = xstrdup(e->masterpath);
@@ -2092,9 +2093,10 @@
+ fprintf(stderr, "%s: switching to SLAVE
location of repository `%s'\n", program_name, e->nickname);
+ fprintf(stderr, "%s: %s --> %s\n",
program_name, e->masterpath, e->slavepath);
+ }
-+ if (CVSroot_parsed->original != NULL)
-+ free(CVSroot_parsed->original);
-+ CVSroot_parsed->original =
xstrdup(e->slavepath);
++ if (CVSroot_parsed != NULL)
++ free_cvsroot_t(CVSroot_parsed);
++ if (!(CVSroot_parsed = parse_cvsroot
(e->slavepath)))
++ error (1, 0, "Bad CVSROOT: `%s'.",
e->slavepath);
+ if (CVSroot_cmdline != NULL)
+ free(CVSroot_cmdline);
+ CVSroot_cmdline = xstrdup(e->slavepath);
@@ -2108,7 +2110,7 @@
}
/* Here begins the big loop over unique cvsroot values. We
-@@ -939,6 +1364,9 @@
+@@ -939,6 +1366,9 @@
end of things. */
while (
@@ -2118,7 +2120,7 @@
#ifdef SERVER_SUPPORT
server_active ||
#endif
-@@ -950,8 +1378,12 @@
+@@ -950,8 +1380,12 @@
in server mode, since the client will send the repository
directory after the connection is made. */
@@ -2131,7 +2133,7 @@
{
/* Now we're 100% sure that we have a valid CVSROOT
variable. Parse it to see if we're supposed to do
-@@ -979,7 +1411,12 @@
+@@ -979,7 +1413,12 @@
save_errno = errno;
/* If this is "cvs init", the root need not exist yet.
*/
@@ -2144,7 +2146,7 @@
error (1, save_errno, "%s", path);
}
free (path);
-@@ -1012,6 +1449,9 @@
+@@ -1012,6 +1451,9 @@
read_cvsrc and other such places or vice versa. That sort
of thing probably needs more thought. */
if (1
@@ -2154,7 +2156,7 @@
#ifdef SERVER_SUPPORT
&& !server_active
#endif
-@@ -1043,7 +1483,31 @@
+@@ -1043,7 +1485,31 @@
}
#endif
@@ -2186,7 +2188,7 @@
#ifdef SERVER_SUPPORT
/* Don't worry about lock_cleanup_setup when the server is
* active since we can only go through this loop once in that
-@@ -1056,6 +1520,9 @@
+@@ -1056,6 +1522,9 @@
!current_parsed_root->isremote &&
#endif
!lock_cleanup_setup))
@@ -2196,7 +2198,7 @@
{
/* Set up to clean up any locks we might create on exit. */
cleanup_register (Lock_Cleanup);
-@@ -1064,7 +1531,32 @@
+@@ -1064,7 +1533,32 @@
/* Call our worker function. */
err = (*(cm->func)) (argc, argv);
@@ -2229,7 +2231,7 @@
/* Mark this root directory as done. When the server is
active, our list will be empty -- don't try and
remove it from the list. */
-@@ -1087,6 +1579,10 @@
+@@ -1087,6 +1581,10 @@
#endif
} /* end of loop for cvsroot values */
@@ -2240,7 +2242,7 @@
dellist (&root_directories);
} /* end of stuff that gets done if the user DOESN'T ask for help */
-@@ -1346,6 +1842,12 @@
+@@ -1346,6 +1844,12 @@
TRACE (TRACE_FUNCTION, "format_date (%s)", datestr);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
