Date: Thu, 2 Nov 2006 11:26:49 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: Kris Kennaway <kris@obsecurity.org> Cc: ports@freebsd.org, Mark Linimon <linimon@lonesome.com> Subject: Re: Syncing up with the package build cluster Message-ID: <200611021126.50306.doconnor@gsoft.com.au> In-Reply-To: <20060924060938.GA18364@xor.obsecurity.org> References: <200609221621.29774.doconnor@gsoft.com.au> <200609241031.16719.doconnor@gsoft.com.au> <20060924060938.GA18364@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart3261805.OKoTb7IMWo Content-Type: multipart/mixed; boundary="Boundary-01=_SJUSFNIeWF5Y8BQ" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_SJUSFNIeWF5Y8BQ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sunday 24 September 2006 15:39, Kris Kennaway wrote: > You'll want to use the FTP site version of this file (once I get it > copied over) instead, since pointyhat will usually be newer than the > FTP sites. On a related note I have patched csup & cvsup to allow you to specify a dat= e=20 on the command line. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --Boundary-01=_SJUSFNIeWF5Y8BQ Content-Type: text/x-diff; charset="utf-8"; name="cvsup-date-cmdline.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="cvsup-date-cmdline.diff" diff -ur cvsup-snap-16.1h.orig/client/src/Main.m3 cvsup-snap-16.1h/client/src/Main.m3 --- cvsup-snap-16.1h.orig/client/src/Main.m3 Wed Mar 5 04:53:46 2003 +++ cvsup-snap-16.1h/client/src/Main.m3 Mon Sep 25 11:08:57 2006 @@ -139,6 +139,7 @@ & "\n -r n Maximum retries on transient errors (default " & "unlimited)" & "\n -s Don't stat client files; trust the checkouts file" + & "\n -t date Override supfile's \"date\" (check out mode)" & "\n -v Print version and exit" & "\n -x Require detailed compare for all RCS files" & "\n -z Enable compression for all collections" @@ -265,6 +266,7 @@ maxRetries := TokScan.AtoI(FetchArg(argNum, argPos), "retry limit"); | 's' => OverrideOn(config, SupFileRec.Option.TrustStatusFile); + | 't' => config.override.checkoutDate := FetchArg(argNum, argPos); | 'v' => justPrintVersion := TRUE; | 'x' => OverrideOn(config, SupFileRec.Option.DetailAllRCSFiles); | 'z' => OverrideOn(config, SupFileRec.Option.Compress); diff -ur cvsup-snap-16.1h.orig/client/src/cvsup.1 cvsup-snap-16.1h/client/src/cvsup.1 --- cvsup-snap-16.1h.orig/client/src/cvsup.1 Wed Mar 5 04:53:46 2003 +++ cvsup-snap-16.1h/client/src/cvsup.1 Mon Sep 25 11:58:30 2006 @@ -48,6 +48,7 @@ .Op Fl p Ar port .Op Fl P Ar m|a|port|lo-hi|- .Op Fl r Ar maxRetries +.Op Fl t Ar date .Ar supfile .Op Ar destDir .Sh DESCRIPTION @@ -384,6 +385,8 @@ updates may be missed, or .Nm may abort prematurely. +.It Fl t Ar date +Overrides the supfile's date entry (checkout mode only). .It Fl v Prints the version number and exits, without contacting the server. .It Fl z diff -ur cvsup-snap-16.1h.orig/suplib/src/SupFileRec.m3 cvsup-snap-16.1h/suplib/src/SupFileRec.m3 --- cvsup-snap-16.1h.orig/suplib/src/SupFileRec.m3 Wed Mar 5 05:56:29 2003 +++ cvsup-snap-16.1h/suplib/src/SupFileRec.m3 Mon Sep 25 11:32:06 2006 @@ -103,7 +103,7 @@ IF v.clientCollDir # NIL THEN self.clientCollDir := v.clientCollDir END; IF v.clientPrefix # NIL THEN self.clientPrefix := v.clientPrefix END; IF v.umask # -1 THEN self.umask := v.umask END; - IF Option.CheckoutMode IN newOptions THEN + IF Option.CheckoutMode IN newOptions OR Option.CheckoutMode IN oldOptions THEN self.checkoutTag := v.checkoutTag; self.checkoutDate := v.checkoutDate; END; --Boundary-01=_SJUSFNIeWF5Y8BQ-- --nextPart3261805.OKoTb7IMWo Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQBFSUJS5ZPcIHs/zowRAuDFAJ9IOarrJrs07YCPFRLuGPKbSlbBdACeN4K4 PPP+ulHq5H4ORKpAFGAaPeg= =mD90 -----END PGP SIGNATURE----- --nextPart3261805.OKoTb7IMWo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611021126.50306.doconnor>