tobuild trouble

[Michael Schwendt]

On Tue, 10 May 2005 20:37:19 +0200, Adrian Reber wrote:

> > > > @@ -1,11 +1 @@
> > > > -# this is the build control file.  the format is
> > > > -# user	repo	tag	target	status
> > > > -# 
> > > > -qspencer	rpms/octave/devel	octave-2_1_70-1	devel
> > > > -mschwendt	rpms/libksba/devel	libksba-0_9_11-1_fc4	devel
> > > > -mschwendt	rpms/gnupg2/devel	gnupg2-1_9_16-1_fc4	devel
> > > > -denis	rpms/glibmm24/FC-3	glibmm24-2_4_7-1	fc3
> > > > -thl	rpms/GtkAda/devel	GtkAda-2_4_0-5	devel
> > > > -jfontain	rpms/moodss/FC-3	moodss-20_0-4	fc3
> > > > -jfontain	rpms/moodss/FC-3	moodss-20_0-4	fc3
> > > > -jfontain	rpms/moodss/devel	moodss-20_0-5_fc4	devel
> > > > +adrian	rpms/fbida/devel	fbida-2_03-5_fc4	devel
> > > 
> > > Did I just break something?
> > 
> > Yeah, because the "rm -f tobuild" added recently was not a good idea
> > (it should just attempt to cvs up, but never remove the local file).
> > Just restore the dropped entries.
> 
> Will restore it as soon as I can connect to the cvs server again.


--- Makefile.common.~1.14.~     2005-05-10 07:57:42.000000000 +0200
+++ Makefile.common     2005-05-10 20:45:56.000000000 +0200
@@ -303,8 +303,7 @@
 build:   $(COMMON_DIR)/branches
        @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
        @(pushd $(COMMON_DIR) >/dev/null ;\
-       rm -f tobuild ;\
-       cvs -Q update ;\
+       cvs -Q update -C ;\
        echo -e "$(USER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
        cvs commit -m"request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
        popd >/dev/null)