$(CVS_CO_DATE_FLAGS) appears twice in checkout command

RESOLVED FIXED

Status

defect
--
trivial
RESOLVED FIXED
12 years ago
2 years ago

People

(Reporter: dholbert, Assigned: dholbert)

Tracking

Trunk
x86
All
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

When I do a checkout for a specified date, I get something like this:

checkout start: Thu Jan 31 17:11:48 PST 2008
cvs -d :ext:dholbert%cs.stanford.edu@cvs.mozilla.org:/cvsroot -q -z 3  co   -D "11 Nov 2006 04:00 PST" -D "11 Nov 2006 04:00 PST" mozilla/client.mk 

Note that there are two copies of -D "11 Nov 2006 04:00 PST" in that message.


The reason for this is as follows, in client.mk:
* First, CVSCO is defined to already include the date flags:
 498 CVSCO = $(CVS) $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG)) $(CVS_CO_DATE_FLAGS)

* But then, when we echo and then run our CVS command, we redundantly include the date flags again, after $(CVSCO):
 793  @echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
 795  $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)

URL: http://mxr.mozilla.org/seamonkey/source/client.mk?rev=1.366

It looks like we've been doing this since bug 261232 landed (attachment 166185 [details] [diff] [review]), when the "CVSCO" variable was first defined to include $(CVS_CO_DATE_FLAGS).
Posted patch patchSplinter Review
I think this fixes it.
Comment on attachment 300786 [details] [diff] [review]
patch

Requesting review from ted, since he's reviewed some other recent build-config changes (bug 412923, bug 413253).

Anyone who can review this is welcome to steal the review, though.
Attachment #300786 - Flags: review?(ted.mielczarek)
Assignee: nobody → dholbert
Severity: normal → trivial
Status: NEW → ASSIGNED
OS: Linux → All
Attachment #300786 - Flags: review?(ted.mielczarek) → review+
Comment on attachment 300786 [details] [diff] [review]
patch

Requesting a1.9.

Trivial patch -- just removes a duplicate copy of the date flags in some CVS checkout commands.
Attachment #300786 - Flags: approval1.9?
Attachment #300786 - Flags: approval1.9? → approval1.9+
Patch checked in.
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.368; previous revision: 1.367
done
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.