diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-10-09 12:14:10 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-10-09 12:14:10 +0000 |
| commit | bf0da457dc70029d92fc9741c4f4a5116c68717d (patch) | |
| tree | b84a141f9b0a907b7498dd30a6ac026b1b1ddcf2 /usr.bin | |
| parent | a4d4ce0910552bac34bbc72a7f3184f199586d94 (diff) | |
cvs import must not parse files in local CVS directory.
OK niallo@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index b11452c8020..b408a8bb995 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.120 2007/10/05 19:28:23 gilles Exp $ */ +/* $OpenBSD: util.c,v 1.121 2007/10/09 12:14:09 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org> @@ -484,7 +484,7 @@ cvs_get_repository_name(const char *dir, char *dst, size_t len) (void)xsnprintf(fpath, sizeof(fpath), "%s/%s", dir, CVS_PATH_REPOSITORY); - if ((fp = fopen(fpath, "r")) != NULL) { + if (cvs_cmdop != CVS_OP_IMPORT && (fp = fopen(fpath, "r")) != NULL) { if ((fgets(dst, len, fp)) == NULL) fatal("cvs_get_repository_name: bad repository file"); |