X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/58141a0ebcdf3313a83af712b83f8acd1c08aa3b..687928ead25cb8f62fdfc58c2e126264e0fb149a:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 115a263ce..cfc27609d 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -11,16 +11,23 @@ sub userinfo_retrieve () { #{{{
 	my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
 	return $userinfo;
 } #}}}
-	
+
 sub userinfo_store ($) { #{{{
 	my $userinfo=shift;
 	
+	my $newfile="$config{wikistatedir}/userdb.new";
 	my $oldmask=umask(077);
-	my $ret=Storable::lock_store($userinfo, "$config{wikistatedir}/userdb");
+	my $ret=Storable::lock_store($userinfo, $newfile);
 	umask($oldmask);
+	if (defined $ret && $ret) {
+		if (! rename($newfile, "$config{wikistatedir}/userdb")) {
+			unlink($newfile);
+			$ret=undef;
+		}
+	}
 	return $ret;
 } #}}}
-	
+
 sub userinfo_get ($$) { #{{{
 	my $user=shift;
 	my $field=shift;
@@ -87,12 +94,8 @@ sub set_banned_users (@) { #{{{
 
 sub commit_notify_list ($@) { #{{{
 	my $committer=shift;
-	
-	my @pages;
-	foreach my $file (@_) {
-		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-	}
-	
+	my @pages = map pagename($_), @_;
+
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
@@ -101,7 +104,10 @@ sub commit_notify_list ($@) { #{{{
 		    length $userinfo->{$user}->{subscriptions} &&
 		    exists $userinfo->{$user}->{email} &&
 		    length $userinfo->{$user}->{email} &&
-		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}, "") } @pages) {
+		    grep { pagespec_match($_,
+				    $userinfo->{$user}->{subscriptions}, 
+				    user => $committer) }
+	    	    	map pagename($_), @_) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}
@@ -151,7 +157,6 @@ sub send_commit_mails ($$$@) { #{{{
 		defined(my $pid = fork) or error("Can't fork: $!");
 		return if $pid;
 		setsid() or error("Can't start a new session: $!");
-		eval q{use POSIX 'setsid'};
 		chdir '/';
 		open STDIN, '/dev/null';
 		open STDOUT, '>/dev/null';