summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Setup/Standard.pm23
-rw-r--r--debian/NEWS8
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/postinst2
-rw-r--r--doc/usage.mdwn3
5 files changed, 19 insertions, 21 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa0..25f038a06 100644
--- 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 80cb489be..19b66c901 100644
--- 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 1e5739e58..2f9fe0cdb 100644
--- 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 fbfc60045..72b457716 100755
--- 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 6ff71056f..7bf50e5f7 100644
--- 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