Update to new snapshot: snap-16.1a ==> snap-16.1b.

This commit is contained in:
John Polstra 2001-07-08 18:47:32 +00:00
parent 37f515f90a
commit 39a5e13ee9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44940
4 changed files with 4 additions and 70 deletions

View File

@ -5,13 +5,13 @@
# $FreeBSD$
#
PORTVERSION= 16.1a
PORTREVISION= 1
PORTVERSION= 16.1b
PORTREVISION= 0
CATEGORIES= net
MASTER_SITES= ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/snapshots/
DISTNAME= cvsup-snap-16.1a
DISTNAME= cvsup-snap-16.1b
MASTERDIR= ${.CURDIR}/../cvsup
FILESDIR= ${.CURDIR}/files

View File

@ -1 +1 @@
MD5 (cvsup-snap-16.1a.tar.gz) = 13ec2cc6a5eb0ce918f53ece6557bfa3
MD5 (cvsup-snap-16.1b.tar.gz) = 205df4ebe9661fb3db5b2bdfc0249e47

View File

@ -1,51 +0,0 @@
Index: client/src/Updater.m3
===================================================================
RCS file: /home/cvsupcvs/cvsup/client/src/Updater.m3,v
retrieving revision 1.97
diff -u -r1.97 Updater.m3
--- client/src/Updater.m3 2001/04/15 21:53:13 1.97
+++ client/src/Updater.m3 2001/05/26 22:58:36
@@ -733,7 +733,7 @@
IF SupFileRec.Option.KeepBadFiles IN sfr.options THEN
Warn(self, "Bad version saved in " & tempPath);
ELSE
- DeleteFile(tempPath);
+ DeleteFile(self, tempPath);
END;
END;
END UpdateFile;
@@ -1231,7 +1231,7 @@
IF NOT SupFileRec.Option.CheckoutMode IN sfr.options THEN
(* Try the attic. *)
WITH atticName = SupMisc.AtticName(destPath) DO
- DeleteFile(atticName);
+ DeleteFile(self, atticName);
(* We always delete the Attic directory when it becomes empty.
FIXME - Is that the right thing to do?. *)
TRY
@@ -1239,7 +1239,7 @@
EXCEPT OSError.E => (* Ignore. *) END;
END;
END;
- DeleteFile(destPath);
+ DeleteFile(self, destPath);
IF SupFileRec.Option.CheckoutMode IN sfr.options
OR NOT self.proto.v.dirsAreExplicit THEN
(* Delete the directory automatically if it is now empty. *)
@@ -1280,14 +1280,13 @@
END;
END MakeDirectories;
-PROCEDURE DeleteFile(path: Pathname.T)
- RAISES {Error} =
+PROCEDURE DeleteFile(self: T; path: Pathname.T) =
BEGIN
TRY
FileAttr.Delete(path);
EXCEPT OSError.E(l) =>
IF l.head # EnoentAtom THEN
- RAISE Error("Cannot delete \"" & path & "\": " &
+ Warn(self, "Cannot delete \"" & path & "\": " &
ErrMsg.StrError(l));
END;
END;

View File

@ -1,15 +0,0 @@
--- quake/cvsup.quake.orig Sun Apr 15 16:22:06 2001
+++ quake/cvsup.quake Sat May 26 16:46:05 2001
@@ -53,10 +53,10 @@
> tempname in
write("MODULE Version;", CR, CR, "BEGIN", CR, " Name := ")
end
- if equal("$Name: SNAP_16_1a $", "$" & "Name: $")
+ if equal("$Name: SNAP_16_1ap1 $", "$" & "Name: $")
cmd = "date -u +'\"U_%Y_%m_%d_%H_%M_%S\";'"
else
- cmd = "echo '$Name: SNAP_16_1a $' | awk '{print \"\\\"\" $2 \"\\\";\";}'"
+ cmd = "echo '$Name: SNAP_16_1ap1 $' | awk '{print \"\\\"\" $2 \"\\\";\";}'"
end
cmd = cmd & " >> " & tempname
if equal(M3_VARIANT, "PM3")