From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Sep 2009 21:16:28 +0000 (-0400)
Subject: Merge commit 'schmonz/master' into cvs
X-Git-Tag: 3.14159265~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593;p=ikiwiki.git

Merge commit 'schmonz/master' into cvs

Conflicts:
	IkiWiki/Plugin/cvs.pm
---

8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593
diff --cc IkiWiki/Plugin/cvs.pm
index 9f91c9335,8409bebed..2c2445f39
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -241,17 -219,15 +219,17 @@@ sub rcs_add ($) 
  			# file
  			my $filemime = File::MimeInfo::default($file);
  			if (defined($filemime) && $filemime eq 'text/plain') {
- 				cvs_runcvs(['add', $file]) ||
+ 				cvs_runcvs('add', $file) ||
  					warn("cvs add $file failed\n");
 -			} else {
 +			}
 +			else {
- 				cvs_runcvs(['add', '-kb', $file]) ||
+ 				cvs_runcvs('add', '-kb', $file) ||
  					warn("cvs add binary $file failed\n");
  			}
 -		} else {
 +		}
 +		else {
  			# directory
- 			cvs_runcvs(['add', $file]) ||
+ 			cvs_runcvs('add', $file) ||
  				warn("cvs add $file failed\n");
  		}
  	}