Browse Source

* popcon.pl:

- revert changes introduced in 1.44.
  - Use :encoding(UTF-8) instead of :utf8 when reapding packages files
  - Add query box linking to <http://qa.debian.org/popcon.php>
suites/ascii
Bill Allombert 14 years ago
parent
commit
008dde1e11
  1. 10
      debian/changelog
  2. 11
      popcon.pl

10
debian/changelog

@ -1,9 +1,15 @@
popularity-contest (1.45) UNRELEASED; urgency=low
[ Petter Reinholdtsen ]
* Fix typo in debug message emitted from prepop.pl.
* Correct charset handling in popcon.pl for ISO-8859-1.
[ Bill Allombert ]
* popcon.pl:
- revert changes introduced in 1.44.
- Use :encoding(UTF-8) instead of :utf8 when reapding packages files
- Add query box linking to <http://qa.debian.org/popcon.php>
-- Petter Reinholdtsen <pere@debian.org> Sat, 12 Apr 2008 00:57:32 +0200
-- Bill Allombert <ballombe@debian.org> Mon, 05 May 2008 22:00:55 +0200
popularity-contest (1.44) unstable; urgency=low

11
popcon.pl

@ -63,6 +63,10 @@ sub popconintro
For more information, read the <a href="${docurlbase}README">README</a> and the
<a href="${docurlbase}FAQ">FAQ</a>.
</em> <p>
<form method="GET" action="http://qa.debian.org/popcon.php">Popcon statistics
for source package <input type="text" size="30" maxlength="80" name="package">
<input type="submit" value="Go">
</form> <p>
EOH
}
@ -224,12 +228,7 @@ for (glob("/org/ftp.root/debian/dists/stable/*/binary-*/Packages.gz"),
{
/([^[:space:]]+)/ or die("incorrect package name");
$file = $1;#Untaint
if ($file =~ m%/dists/stable/%) {
# Stable release (Etch) do not use UTF-8 in its package files
open AVAIL, "-|:encoding(iso-8859-1)","zcat $file";
} else {
open AVAIL, "-|:utf8","zcat $file";
}
open AVAIL, "-|:encoding(UTF-8)","zcat $file";
while(<AVAIL>)
{
/^Package: (.+)/ and do {$p=$1;$maint{$p}="bug";$source{$p}=$p;next;};

Loading…
Cancel
Save