urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On some systems the commit message gets quoted properly already. Don't 

requote in such cases, do quote in all others.
master
Amitai Schlair 2009-08-30 16:13:17 -04:00
parent e972cadf78
commit 1af7d7d842
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Plugin/cvs.pm
View File

@ -119,11 +119,21 @@ sub cvs_runcvs(@) {
sub cvs_shquote_commit ($) { sub cvs_shquote_commit ($) {
my $message = shift; my $message = shift;
my $test_message = "CVS autodiscover quoting CVS";
eval q{use String::ShellQuote}; eval q{use String::ShellQuote};
error($@) if $@; error($@) if $@;
eval q{use IPC::Cmd};
error($@) if $@;
return shell_quote(IkiWiki::possibly_foolish_untaint($message)); my $cmd = ['echo', shell_quote($test_message)];
my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
IPC::Cmd::run(command => $cmd, verbose => 0);
if ((grep /'$test_message'/, @$stdout_buf) > 0) {
return IkiWiki::possibly_foolish_untaint($message);
} else {
return shell_quote(IkiWiki::possibly_foolish_untaint($message));
}
} }
sub cvs_is_controlling { sub cvs_is_controlling {