At 14:49 27/08/2002 +0200, Kaja P. Christiansen wrote: >Odhiambo Washington writes: > > > Probably the way you downloaded the patches... > > How did you do it? > > I've downloaded them before and they applied cleanly. > >Thanks! The patch file must have been corrupted. I downloaded >it again and the result is better, but the patch doesn't apply >quite cleanly:
It looks as though you may not have applied the precursor indexing-2.0.13-0.2.patch which you can find at http://sourceforge.net/tracker/index.php?func=detail&aid=444879&group_id=103&atid=300103 as stipulated in the notes for the htdig integration patch 444884. Also, from the offsets being cited in your post when you apply htdig-2.0.13-0.2.patch, it doesn't look as though may not be applying it to a standard Mailman 2.0.13 distribution, but I could be wrong about this. For instance when I do what I think you may have done I get what follows but, as you can see, while broadly similar the actual offsets are slightly different: mailman@mailman2:/mailman/build> zcat distributions/mailman-2.0.13.tgz | tar xf - mailman@mailman2:/mailman/build> cd mailman-2.0.13 mailman@mailman2:/mailman/build/mailman-2.0.13> patch -p1 < ../patches/current/htdig-2.0.13-0.2.patch patching file INSTALL patching file INSTALL.htdig-mm patching file Mailman/Archiver/HyperArch.py Hunk #2 succeeded at 507 (offset -11 lines). Hunk #3 succeeded at 540 (offset -14 lines). Hunk #4 succeeded at 672 (offset -14 lines). Hunk #5 succeeded at 691 (offset -14 lines). Hunk #6 FAILED at 746. Hunk #7 succeeded at 752 (offset -21 lines). Hunk #8 succeeded at 778 (offset -21 lines). 1 out of 8 hunks FAILED -- saving rejects to file Mailman/Archiver/HyperArch.py.rej patching file Mailman/Cgi/htdig.py patching file Mailman/Cgi/updateTOC.py patching file Mailman/Defaults.py.in Hunk #1 FAILED at 553. 1 out of 1 hunk FAILED -- saving rejects to file Mailman/Defaults.py.in.rej patching file Makefile.in patching file bin/Makefile.in patching file bin/blow_away_htdig patching file cron/Makefile.in patching file cron/crontab.in.in patching file cron/nightly_htdig patching file cron/remote_nightly_htdig patching file cron/remote_nightly_htdig.pl patching file cron/remote_nightly_htdig_noshare patching file src/Makefile.in mailman@mailman2:/mailman/build> >[mailman-2.0.13]$ md5sum htdig-2.0.13-0.2.patch >cc3115a099507d45a72642722c56dfce htdig-2.0.13-0.2.patch >[mailman-2.0.13]$ patch -p1 < htdig-2.0.13-0.2.patch >patching file INSTALL >patching file INSTALL.htdig-mm >patching file Mailman/Archiver/HyperArch.py >Hunk #2 succeeded at 507 (offset -11 lines). >Hunk #3 succeeded at 551 (offset -3 lines). >Hunk #4 succeeded at 675 (offset -11 lines). >Hunk #5 succeeded at 702 (offset -3 lines). >Hunk #6 FAILED at 757. >Hunk #7 succeeded at 755 (offset -18 lines). >Hunk #8 succeeded at 796 (offset -3 lines). >1 out of 8 hunks FAILED -- saving rejects to file >Mailman/Archiver/HyperArch.py.rej >patching file Mailman/Cgi/htdig.py >patching file Mailman/Cgi/updateTOC.py >patching file Mailman/Defaults.py.in >Hunk #1 FAILED at 553. >1 out of 1 hunk FAILED -- saving rejects to file Mailman/Defaults.py.in.rej >patching file Makefile.in >patching file bin/Makefile.in >patching file bin/blow_away_htdig >patching file cron/Makefile.in >patching file cron/crontab.in.in >patching file cron/nightly_htdig >patching file cron/remote_nightly_htdig >patching file cron/remote_nightly_htdig.pl >patching file cron/remote_nightly_htdig_noshare > > >Kaja ------------------------------------------------------ Mailman-Users mailing list [EMAIL PROTECTED] http://mail.python.org/mailman/listinfo/mailman-users Mailman FAQ: http://www.python.org/cgi-bin/faqw-mm.py Searchable Archives: http://www.mail-archive.com/mailman-users%40python.org/
