diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-04-10 11:26:11 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-04-10 11:26:11 +0000 |
| commit | 2762d6caa1d744de66700e843278eb5b10efd288 (patch) | |
| tree | fbf28e4da0a958f1333b873c0b63a4d65c0b3018 | |
| parent | 96b7db87460288737bcc4e9683c36c4879da9024 (diff) | |
with the recent module-expand changes, we need to use
the correct repository path in Set-sticky and Clear-sticky
otherwise we'll end up with stuff like src/bin/ls/src/bin/ls
in CVS/Repository which pretty much breaks.
noticed & ok sthen@
| -rw-r--r-- | usr.bin/cvs/server.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c index c49d1d3b804..a4b4b9097a1 100644 --- a/usr.bin/cvs/server.c +++ b/usr.bin/cvs/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.97 2009/04/04 11:32:48 joris Exp $ */ +/* $OpenBSD: server.c,v 1.98 2009/04/10 11:26:10 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -791,12 +791,7 @@ cvs_server_set_sticky(const char *dir, const char *tag) char repo[MAXPATHLEN]; cvs_get_repository_path(dir, repo, MAXPATHLEN); - if (module_repo_root != NULL) { - (void)xsnprintf(fpath, MAXPATHLEN, "%s/%s/%s", - current_cvsroot->cr_dir, module_repo_root, repo); - } else { - (void)xsnprintf(fpath, MAXPATHLEN, "%s/", repo); - } + (void)xsnprintf(fpath, MAXPATHLEN, "%s/", repo); cvs_server_send_response("Set-sticky %s/", dir); cvs_remote_output(fpath); @@ -810,12 +805,7 @@ cvs_server_clear_sticky(char *dir) char repo[MAXPATHLEN]; cvs_get_repository_path(dir, repo, MAXPATHLEN); - if (module_repo_root != NULL) { - (void)xsnprintf(fpath, MAXPATHLEN, "%s/%s/%s", - current_cvsroot->cr_dir, module_repo_root, repo); - } else { - (void)xsnprintf(fpath, MAXPATHLEN, "%s/", repo); - } + (void)xsnprintf(fpath, MAXPATHLEN, "%s/", repo); cvs_server_send_response("Clear-sticky %s//", dir); cvs_remote_output(fpath); |