From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 17:44:03 +0000 (-0400)
Subject: include temp file for attachment change too
X-Git-Tag: 2.68~95
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1a883b3c504a543c8f4a5b5bb9687e7770f28a4f?ds=sidebyside;hp=--cc

include temp file for attachment change too
---

1a883b3c504a543c8f4a5b5bb9687e7770f28a4f
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3a8476e7d..84df56181 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -619,7 +619,7 @@ sub rcs_receive () { #{{{
 		
 		# Avoid chdir when running git here, because the changes
 		# are in the master git repo, not the srcdir repo.
-		# The pre-receive hook already puts us in the right place.
+		# The pre-recieve hook already puts us in the right place.
 		$no_chdir=1;
 		my @changes=git_commit_info($oldrev."..".$newrev);
 		$no_chdir=0;
@@ -643,15 +643,6 @@ sub rcs_receive () { #{{{
 				elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
 					$action="add";
 					$mode=$detail->{'mode_to'};
-					if (! pagetype($file)) {
-						eval q{use File::Temp};
-						die $@ if $@;
-						my $fh;
-						($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
-						if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
-							error("failed writing temp file");
-						}
-					}
 				}
 				elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
 					$action="remove";
@@ -670,6 +661,18 @@ sub rcs_receive () { #{{{
 						error gettext("you are not allowed to change file modes");
 					}
 				}
+				
+				# extract attachment to temp file
+				if (($action eq 'add' || $action eq 'change') &&
+				     ! pagetype($file)) {
+					eval q{use File::Temp};
+					die $@ if $@;
+					my $fh;
+					($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
+					if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
+						error("failed writing temp file");
+					}
+				}
 
 				push @rets, {
 					file => $file,
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index c69911a7c..9a672abc9 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -45,7 +45,7 @@ sub test () { #{{{
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
 		    IkiWiki::file_pruned($file, $config{srcdir})) {
-			error(gettext("bad file name"));
+			error(gettext("bad file name %s"), $file);
 		}
 
 		my $type=pagetype($file);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5ee4acb53..abcabbdc3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -837,8 +837,8 @@ files that were changed, in the form:
 		file => # name of file that was changed
 		action => # either "add", "change", or "remove"
 		path => # temp file containing the new file content, only
-			# needed for "add", and only if the file is an
-			# attachment, not a page
+			# needed for "add"/"change", and only if the file
+			# is an attachment, not a page
 	}
 
 The list will then be checked to make sure that each change is one that