Bug#192768: marked as done (www.debian.org: searchtml/Makefile broken)
Your message dated Sun, 11 May 2003 14:51:02 +0200
with message-id <20030511125102.GA26979@prvidomaci.srce.hr>
and subject line Bug#192768: www.debian.org: searchtml/Makefile broken
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 10 May 2003 09:05:02 +0000
>From frank@lichtenheld.de Sat May 10 04:04:54 2003
Return-path: <frank@lichtenheld.de>
Received: from sorgfalt.net (mail.sorgfalt.net) [217.160.169.191]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 19EQHl-0007fa-00; Sat, 10 May 2003 04:04:53 -0500
Received: from pd9530999.dip.t-dialin.net ([217.83.9.153] helo=djpig.hell)
by mail.sorgfalt.net with asmtp (Exim 3.35)
id 19EQHi-0005ZO-00; Sat, 10 May 2003 11:04:52 +0200
Received: from djpig by djpig.hell with local (Exim 3.35 #1 (Debian))
id 19EQHM-00012R-00; Sat, 10 May 2003 11:04:28 +0200
From: Frank Lichtenheld <frank@lichtenheld.de>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: www.debian.org: searchtml/Makefile broken
X-Mailer: reportbug 1.50
Date: Sat, 10 May 2003 11:04:26 +0200
Message-Id: <[🔎] E19EQHM-00012R-00@djpig.hell>
Sender: Frank Lichtenheld <frank@lichtenheld.de>
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-11.3 required=4.0
tests=BAYES_10,HAS_PACKAGE,HTML_10_20,PATCH_UNIFIED_DIFF
version=2.53-bugs.debian.org_2003_05_09
X-Spam-Level:
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_05_09 (1.174.2.15-2003-03-30-exp)
Package: www.debian.org
Version: N/A; reported 2003-05-10
Severity: normal
Tags: patch
searchtml/Makefile is broken. It overwrites the source file search.wml
The following patch should fix this:
Index: Makefile
===================================================================
RCS file: /cvs/webwml/webwml/english/searchtmpl/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 2 May 2003 14:05:14 -0000 1.7
+++ Makefile 10 May 2003 08:55:40 -0000
@@ -17,4 +17,5 @@
$(WML) $<
# XXX this likely doesn't work at all for SUBLANG-enabled languages!
c=`grep CHARSET ../.wmlrc | cut -d= -f2`; \
- iconv -f $$c -t UTF-8 $< | perl -pe 's,^(\s*<meta http-equiv="Content-Type" content="text/html; charset=)\S+(">)$$,$$1UTF-8$$2,' > $<
+ iconv -f $$c -t UTF-8 $@ | perl -pe 's,^(\s*<meta http-equiv="Content-Type" content="text/html; charset=)\S+(">)$$,$$1UTF-8$$2,' > $@.tmp
+ mv $@.tmp $@
Note that the empty search.wml files will not be updated by cvs update -Pd.
Someone has to delete them (and then run update) or to run cvs update -C once.
Frank
-- System Information
Debian Release: 3.0
Architecture: i386
Kernel: Linux djpig 2.4.20 #1 Fri Mar 7 14:16:01 CET 2003 i686
Locale: LANG=de_DE, LC_CTYPE=de_DE
---------------------------------------
Received: (at 192768-done) by bugs.debian.org; 11 May 2003 12:51:18 +0000
>From joy@srce.hr Sun May 11 07:51:06 2003
Return-path: <joy@srce.hr>
Received: from prvidomaci.srce.hr [161.53.1.72]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 19EqIB-0007Uf-00; Sun, 11 May 2003 07:51:03 -0500
Received: from joy by prvidomaci.srce.hr with local (Exim 3.36 #1 (Debian))
id 19EqIA-00072I-00; Sun, 11 May 2003 14:51:02 +0200
Date: Sun, 11 May 2003 14:51:02 +0200
From: Josip Rodin <joy@srce.hr>
To: Frank Lichtenheld <frank@lichtenheld.de>
Cc: 192768-done@bugs.debian.org
Subject: Re: Bug#192768: www.debian.org: searchtml/Makefile broken
Message-ID: <20030511125102.GA26979@prvidomaci.srce.hr>
References: <[🔎] E19EQHM-00012R-00@djpig.hell> <[🔎] 20030510124811.GA5570@prvidomaci.srce.hr> <[🔎] 20030510201937.GD920@djpig.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <[🔎] 20030510201937.GD920@djpig.de>
User-Agent: Mutt/1.5.4i
Sender: Josip Rodin <joy@srce.hr>
Delivered-To: 192768-done@bugs.debian.org
X-Spam-Status: No, hits=-26.3 required=4.0
tests=BAYES_10,EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,
REFERENCES,REPLY_WITH_QUOTES,USER_AGENT_MUTT
autolearn=ham version=2.53-bugs.debian.org_2003_05_09
X-Spam-Level:
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_05_09 (1.174.2.15-2003-03-30-exp)
On Sat, May 10, 2003 at 10:19:37PM +0200, Frank Lichtenheld wrote:
> > > searchtml/Makefile is broken. It overwrites the source file search.wml
> > > The following patch should fix this:
> > >
> > > c=`grep CHARSET ../.wmlrc | cut -d= -f2`; \
> > > - iconv -f $$c -t UTF-8 $< | perl -pe 's,^(\s*<meta http-equiv="Content-Type" content="text/html; charset=)\S+(">)$$,$$1UTF-8$$2,' > $<
> > > + iconv -f $$c -t UTF-8 $@ | perl -pe 's,^(\s*<meta http-equiv="Content-Type" content="text/html; charset=)\S+(">)$$,$$1UTF-8$$2,' > $@.tmp
> > > + mv $@.tmp $@
> >
> > Silly person, just s/$</$@/g in the iconv | perl line :)
>
> Hmm, don't forget the tmpfile moves. With just s/$</$@/ it will no
> longer overwrite search.wml, but search.$(LANG).html will be empty.
> But you probably knew that.
Hm, I had the distinct impression that one of those reads the whole file
before we get to the final redirection. Looking at it now, only 2 of 20
files weren't emptied, probably by mere coincidence that allowed them to
avoid the race condition.
> Anyway, I will commit the change, but as I said, one has to make sure
> it get repaired in the working directory on www.d.o
> Whoever will do this should then close the bug.
Yes. It's (being) fixed on www-master now. Thanks.
--
2. That which causes joy or happiness.
Reply to: