* Make ikiwiki --setup --refresh rebuild wrappers, so wrapper rebuild

  will be automatically done on all upgrades.

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa08d0767743d5036ab9b6948a2ffd19da..25f038a064ac8ceab4333f0d93ba13b1203262f2 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -31,21 +31,16 @@ sub setup_standard {
                delete $setup{disable_plugins};
        }
 
-       if (! $config{refresh}) {
-               debug("generating wrappers..");
-               my @wrappers=@{$setup{wrappers}};
-               delete $setup{wrappers};
-               my %startconfig=(%config);
-               foreach my $wrapper (@wrappers) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-                       checkconfig();
-                       gen_wrapper();
-               }
-               %config=(%startconfig);
-       }
-       else {
-               delete $setup{wrappers};
+       debug("generating wrappers..");
+       my @wrappers=@{$setup{wrappers}};
+       delete $setup{wrappers};
+       my %startconfig=(%config);
+       foreach my $wrapper (@wrappers) {
+               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               checkconfig();
+               gen_wrapper();
        }
+       %config=(%startconfig);
        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {

diff --git a/debian/NEWS b/debian/NEWS
index 80cb489be295ec3d320cefd7721f8a899049f02b..19b66c9018a651b9223f86d7877721c45e1a7dca 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -15,10 +15,10 @@ ikiwiki (1.8) unstable; urgency=low
   Making this change makes your ikiwiki setup file more future-proof since
   new default plugins will be automatically used.
   
-  You will need to rebuild your wiki when upgrading to this version.
-  If you listed your wiki in /etc/ikiwiki/wikilist this will be done
-  automatically when the Debian package is upgraded. Or use
-  ikiiki-mass-rebuild to force a rebuild.
+  You will need to rebuild your ikiwiki wrappers when upgrading to this
+  version. If you listed your wiki in /etc/ikiwiki/wikilist this will be
+  done automatically when the Debian package is upgraded. Or use
+  ikiiki-mass-rebuild --refresh to force a refresh.
 
  -- Joey Hess <joeyh@debian.org>  Mon,  3 Jul 2006 16:59:29 -0400
 

diff --git a/debian/changelog b/debian/changelog
index 1e5739e58538fc925cee5c5cd0964c76dca84d6a..2f9fe0cdbb47e05e4d4b7e4a64a1e6bc1a5e9b92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,8 +35,10 @@ ikiwiki (1.8) UNRELEASED; urgency=low
     be copied unsanitised. With this plugin, it will process, and html
     sanitise them, like any other page type.
   * Rebuilding wrappers is necessary on upgrade to this version.
+  * Make ikiwiki --setup --refresh rebuild wrappers, so wrapper rebuild
+    will be automatically done on all upgrades.
 
- -- Joey Hess <joeyh@debian.org>  Mon,  3 Jul 2006 18:15:30 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon,  3 Jul 2006 20:24:18 -0400
 
 ikiwiki (1.7) unstable; urgency=low
 

diff --git a/debian/postinst b/debian/postinst
index fbfc60045d55609cffdf25a520e5a700c54621d5..72b457716af6434e74b45994bc4c23d42b647df6 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=1.8
+firstcompat=1.4
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 6ff71056f2bd018b411f246c25b590a5fd86d849..7bf50e5f7e07e45a4ae9e34e2e1da3b3a0b7bc98 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -24,7 +24,8 @@ These options control the mode that ikiwiki is operating in.
 * --refresh
 
   Refresh the wiki, updating any changed pages. This is the default
-  behavior so you don't normally need to specify it.
+  behavior so you don't normally need to specify it. If used with -setup also
+  updates any configured wrappers.
 
 * --rebuild