Your message dated Sun, 16 Dec 2007 13:47:02 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#454757: fixed in dwww 1.10.10 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)
--- Begin Message ---Package: dwww Version: 1.10.8 Severity: wishlist Tags: patch *** Please type your report below this line *** Included find a patch that makes the following changes (for the better, I hope) in dwww-index++: + eliminate duplicates by hashing, not by sorting + eliminate multiple symlinks from list of indexed files, by using stat + sort list of files by device:inode instead of name, to improve locality + added option -l to just print the list of files (for users who want to do their own incremental indexing) -- System Information: Debian Release: lenny/sid APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.22-6unicorn200712031135 (SMP w/1 CPU core) Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/dash Versions of packages dwww depends on: ii apache [httpd-cgi] 1.3.34-4.1 versatile, high-performance HTTP s ii debconf [debconf-2.0] 1.5.17 Debian configuration management sy ii debianutils 2.25.1 Miscellaneous utilities specific t ii doc-base 0.8.6 utilities to manage online documen ii file 4.21-3 Determines file type using "magic" ii libc6 2.6.1-1+b1 GNU C Library: Shared libraries ii libfile-ncopy-perl 0.34-1 file copying like cp for perl ii libmime-types-perl 1.22-1 Perl extension for determining MIM ii man-db 2.5.0-4 on-line manual pager ii menu 2.1.36 generates programs menu for all me ii mime-support 3.39-1 MIME files 'mime.types' & 'mailcap ii perl 5.8.8-12 Larry Wall's Practical Extraction Versions of packages dwww recommends: ii apt 0.7.6 Advanced front-end for dpkg ii dlocate 0.5-0.3 fast alternative to dpkg -L and dp ii info2www 1.2.2.9-23 Read info files with a WWW browser -- debconf information excluded --- dwww-index++.orig 2007-12-07 09:16:35.000000000 -0500 +++ dwww-index++ 2007-12-07 10:16:58.000000000 -0500 @@ -52,7 +52,7 @@ my $dwww_swish_index_tmp = "/var/cache/dwww/dwww.swish++.tmp.index"; my $dwww_swish_index_res = $dwww_swish_index_tmp; my @files = (); # list of files to index; -our($opt_v, $opt_f); # set by getopt +our($opt_v, $opt_f, $opt_l); # set by getopt my $dwwwconf = &DwwwInitialize("/etc/dwww/dwww.conf"); &DwwwSetupDirs($dwwwconf); @@ -65,7 +65,7 @@ exit(1); } $Getopt::Std::STANDARD_HELP_VERSION=1; -&getopts('vf'); +&getopts('vfl'); my $do_index = $dwwwconf->{'DWWW_INDEX_DOCUMENTATION'}; if (!$opt_f and defined $do_index and lc($do_index) eq "no") { @@ -77,7 +77,7 @@ my $m2h_merge = $dwwwconf->{'DWWW_MERGE_MAN2HTML_INDEX'}; my $m2h_idx_file = '/var/cache/man2html/man2html.swish++.index'; -if (defined $m2h_merge and lc($m2h_merge) eq "yes" and -r $m2h_idx_file) { +if (!$opt_l and defined $m2h_merge and lc($m2h_merge) eq "yes" and -r $m2h_idx_file) { if (copy($m2h_idx_file, $dwww_swish_index_tmp)) { $dwww_swish_index_res = $dwww_swish_index_tmp . '.new'; push(@index_command, '--incremental'); @@ -96,16 +96,28 @@ &FilesFromDocBaseDir("/usr/share/doc-base"); &FilesFromDocBaseDir("/var/lib/dwww/menu-method"); -print STDERR "Sorting list of files\n" if $opt_v; [EMAIL PROTECTED] = sort @files; +my %filenames_hash = ( ); +$filenames_hash{$_} = 1 foreach (@files); +$filenames_hash{$_} = [ stat ] foreach (keys %filenames_hash); + +my %inodes_hash = ( ); +foreach my $k (keys %filenames_hash) { + $inodes_hash{"$filenames_hash{$k}->[0]:$filenames_hash{$k}->[1]"} = $k; +} + +if ($opt_l) { + foreach my $ino (sort (keys %inodes_hash)) { + syswrite STDOUT, "$inodes_hash{$ino}\n"; + } + exit 0; +} print STDERR "Executing: @index_command\n" if $opt_v; open (INDEX, '|-') || exec { $index_command[0] } @index_command; -# try to avoid indexing the same file twice -for (my $i = 0; $i <= $#files; $i++) { - syswrite INDEX, "$files[$i]\n" unless ($i > 0 and $files[$i] eq $files[$i - 1]); +foreach my $ino (sort (keys %inodes_hash)) { + syswrite INDEX, "$inodes_hash{$ino}\n"; # sleep 150 ms select(undef, undef, undef, 0.15); } @@ -209,6 +221,7 @@ print STDOUT "Usage: $prog [-v] [-f] [-- swish_option [...]]\n"; print STDOUT " -v be more verbose\n"; print STDOUT " -f build the index even if it's disabled in the configuration file\n"; + print STDOUT " -l do not really index, only output the list of files to index\n"; print STDOUT " -- opt option passed to swish's index++ program\n"; }
--- End Message ---
--- Begin Message ---Source: dwww Source-Version: 1.10.10 We believe that the bug you reported is fixed in the latest version of dwww, which is due to be installed in the Debian FTP archive: dwww_1.10.10.dsc to pool/main/d/dwww/dwww_1.10.10.dsc dwww_1.10.10.tar.gz to pool/main/d/dwww/dwww_1.10.10.tar.gz dwww_1.10.10_i386.deb to pool/main/d/dwww/dwww_1.10.10_i386.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Robert Luberda <[EMAIL PROTECTED]> (supplier of updated dwww package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Sat, 15 Dec 2007 18:12:58 +0100 Source: dwww Binary: dwww Architecture: source i386 Version: 1.10.10 Distribution: unstable Urgency: low Maintainer: Robert Luberda <[EMAIL PROTECTED]> Changed-By: Robert Luberda <[EMAIL PROTECTED]> Description: dwww - Read all on-line documentation with a WWW browser Closes: 454612 454757 456371 Changes: dwww (1.10.10) unstable; urgency=low . * dwww-index++: + apply patch with improvements from Ian Zimmerman (closes: #454757), + rewrite and refactor the code, + add support for incremental indexing (closes: #454612). By default generate full index each month and incremental index each week. * dwww-refresh-cache: made it work when /var/cache/dwww is a symlink. * cron.weekly: use ionice(1) to set the lowest io sheduling class. * Add support for https protocol (closes: #456371). * Remove empty /u/s/lintian/overrides directory (lintian). * Standards-Verion: 3.7.2 (no changes). * Update documentation. Files: 061651eb922c01f428799b24975c7269 495 doc optional dwww_1.10.10.dsc f83349255c3b5dbd5951da420d0a4fe6 116304 doc optional dwww_1.10.10.tar.gz 2bf8dc2eac6e8623d466805eefbdece3 116000 doc optional dwww_1.10.10_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHZPfyThh1cJ0wnDsRAiLFAJ9x97TsBkDOqDqKb3L8u8+9Ssuu6QCggK8Z yTaAAOeGCekBgjrmjOPvJkE= =ggJ/ -----END PGP SIGNATURE-----
--- End Message ---
