1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Add a patch for cvsupd to make it honor the "refuse" file for files

that are in the Attic.  This solves the problem people are having
where their INDEX* files are being deleted even though they have
them listed in the refuse file.  Since the bug is in the server,
mirror sites will need to upgrade their CVSup installation in order
for users to benefit from this fix.

Note:  I bumped PORTREVISION from 0 to 2, intentionally skipping 1.
The amd64 version of this port had already bumped it to 1, and I
didn't want to confuse matters by bumping the other architectures to
the same revision number.

Approved by:	portmgr (krion)
This commit is contained in:
John Polstra 2005-03-25 21:38:06 +00:00
parent 98b89f99c5
commit bdaf18c2eb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=131952
2 changed files with 44 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= cvsup
PORTVERSION?= 16.1h
PORTREVISION?= 0
PORTREVISION?= 2
CATEGORIES= net devel
MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}
MASTER_SITE_SUBDIR=development/CVSup/snapshots

43
net/cvsup/files/patch-ae Normal file
View File

@ -0,0 +1,43 @@
Index: server/src/TreeComp.m3
===================================================================
RCS file: /home/cvsupcvs/cvsup/server/src/TreeComp.m3,v
retrieving revision 1.76
diff -u -r1.76 TreeComp.m3
--- server/src/TreeComp.m3 4 Mar 2003 19:26:17 -0000 1.76
+++ server/src/TreeComp.m3 25 Mar 2005 19:34:43 -0000
@@ -662,21 +662,20 @@
type := FileInfo.Type.Live);
END;
| CVTree.FileType.AtticFile =>
- WITH atticPath = SupMisc.AtticName(path) DO
- IF attr.fileType = FileAttr.FileType.File
- AND SupMisc.IsRCS(path) THEN
- IF m.sfr.fileFilter.test(atticPath) THEN
- RETURN NEW(FileInfo.T,
- name := path,
- attr := attr,
- type := FileInfo.Type.Dead);
- END;
- ELSE (* Non-RCS file in the Attic?! *)
- WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix, atticPath)
- DO
- Warning(m.treeComp,
- "Non-RCS file \"" & fullPath & "\" in Attic");
- END;
+ IF attr.fileType = FileAttr.FileType.File
+ AND SupMisc.IsRCS(path) THEN
+ IF m.sfr.fileFilter.test(path) THEN
+ RETURN NEW(FileInfo.T,
+ name := path,
+ attr := attr,
+ type := FileInfo.Type.Dead);
+ END;
+ ELSE (* Non-RCS file in the Attic?! *)
+ WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix,
+ SupMisc.AtticName(path))
+ DO
+ Warning(m.treeComp,
+ "Non-RCS file \"" & fullPath & "\" in Attic");
END;
END;
| CVTree.FileType.DirUp =>