* Add .dpkg-tmp to prune regexp, so that if ikiwiki is run right as it's

  being upgraded by dpkg it will ignore dpkg temp files in the basewiki.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 679ca716e72c171665a1bddd01adb65cca167483..5f0055d3ed787d08f5436fff1bbee0fcb8d86a3c 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -31,7 +31,8 @@ memoize("file_pruned");
 sub defaultconfig () { #{{{
        wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./,
                qr/\.x?html?$/, qr/\.ikiwiki-new$/,
-               qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
+               qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
+               qr/\.dpkg-tmp$/],
        wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,

diff --git a/debian/changelog b/debian/changelog
index 20e92c43c0765e1a30bf8b450040fbb4bed938be..fd5fda5966a8a07b6fb4de26585b60ae30681047 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,10 @@ ikiwiki (1.50) UNRELEASED; urgency=low
     usedirs you'll have to deal with that on upgrade to this version.
   * Add feedshow parameter to inline, which can be useful for eg, removing
     old posts from feeds when permalinks change.
+  * Add .dpkg-tmp to prune regexp, so that if ikiwiki is run right as it's
+    being upgraded by dpkg it will ignore dpkg temp files in the basewiki.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 14 Apr 2007 16:52:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Apr 2007 14:09:54 -0400
 
 ikiwiki (1.49) unstable; urgency=low