- Maintenance update to 16.1h.

- Add a patch for cvsupd to make it honor the "refuse" file for files
that are in the Attic (from jdp).
This commit is contained in:
naddy 2005-03-28 19:06:25 +00:00
parent c2a9bc9b3c
commit 09f8ae9dcb
3 changed files with 45 additions and 6 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2005/02/11 12:43:46 alek Exp $
# $OpenBSD: Makefile,v 1.15 2005/03/28 19:06:25 naddy Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "network file distribution system"
COMMENT-server= "network file distribution server"
VERSION= 16.1g
VERSION= 16.1h
DISTNAME= cvsup-snap-${VERSION}
PKGNAME= cvsup-${VERSION}
PKGNAME-server= cvsupd-${VERSION}

View File

@ -1,4 +1,4 @@
MD5 (cvsup-snap-16.1g.tar.gz) = 253e773eb9d213f9bf3ce12acef184e8
RMD160 (cvsup-snap-16.1g.tar.gz) = 355fba88727a7254827f7bd2960a470648eeacff
SHA1 (cvsup-snap-16.1g.tar.gz) = 14ac2bfacbd03f90557c4acd00cd547cc1e5ba7e
SIZE (cvsup-snap-16.1g.tar.gz) = 430151
MD5 (cvsup-snap-16.1h.tar.gz) = b100ace98a41aa9f3d3e75b0d3c245b0
RMD160 (cvsup-snap-16.1h.tar.gz) = 3d90676dfcc15781855c7dfe6aa0c1b37ee3c5af
SHA1 (cvsup-snap-16.1h.tar.gz) = 976439eb09c9e929d3bb2837b5e4db14719393b2
SIZE (cvsup-snap-16.1h.tar.gz) = 430951

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-server_src_TreeComp_m3,v 1.1 2005/03/28 19:06:25 naddy Exp $
--- server/src/TreeComp.m3.orig Tue Mar 4 20:26:17 2003
+++ server/src/TreeComp.m3 Sun Mar 27 00:22:15 2005
@@ -662,21 +662,20 @@ PROCEDURE GetFromServer(m: Merger): File
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 =>