Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/bugs/aggregate_removed_feeds_linger.mdwn b/doc/bugs/aggregate_removed_feeds_linger.mdwn
new file mode 100644 (file)
index 0000000..3e856e2
--- /dev/null
+++ b/doc/bugs/aggregate_removed_feeds_linger.mdwn
@@ -0,0 +1,11 @@
+When the [[plugins/aggregate]] plugin was used for a feed and this is removed (or the
+same feed name given a different rss feed), the old entries don't
+automatically vanish.
+
+I think that if it was just removed, they are never GC'd, because the
+expiry code works on the basis of existing feeds. And if it was replaced,
+old items won't go away until expirecount or expireage is met.
+
+To fix it probably needs an explicit check for items aggregated by feeds
+that no longer provide them, Catching old items for feeds that were changed
+to a different url may be harder yet. --[[Joey]]

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index bbef4946bb5b76d4aa6f5a291b253ada42309529..9b57532bcce1897454b46a08ef62055c6982525c 100755 (executable)
--- a/ikiwiki-mass-rebuild
+++ b/ikiwiki-mass-rebuild
@@ -29,7 +29,7 @@ sub processline {
 my %users;
 sub processuser {
        my $user=shift;
-       next if $user=~/^-/ || $users{$user};
+       return if $user=~/^-/ || $users{$user};
        $users{$user}=1;
        my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV");
        if ($ret != 0) {