diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-20 23:00:14 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-20 23:00:14 +0000 |
| commit | 466615db3f495ecb0b1df3c623bea98d8803c0d4 (patch) | |
| tree | a1737a0b6ba14bb9b5b81e9c24c61c45dc986d54 /usr.bin/cvs | |
| parent | 6052328d228068829e136ee14a9fb1d1c9f8e44d (diff) | |
Don't parse CVS/Root during import.
ok joris
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/root.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index 6c45f25a903..a96d57fb46c 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.44 2007/10/05 19:28:23 gilles Exp $ */ +/* $OpenBSD: root.c,v 1.45 2008/06/20 23:00:13 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -174,6 +174,9 @@ cvsroot_get(const char *dir) if (cvs_server_active == 1) return cvsroot_parse(dir); + if (cvs_cmdop == CVS_OP_IMPORT) + return NULL; + (void)xsnprintf(rootpath, MAXPATHLEN, "%s/%s", dir, CVS_PATH_ROOTSPEC); if ((fp = fopen(rootpath, "r")) == NULL) { |