The patch below should solve this problem.

I expect this will also solve
  #305793 Attach files to TWiki topics fails after update
and an un-related (un-reported?) problem.

(Sven: should I make a reportbug for the "unrelated" problem?)

Cheers,

Paul Szabo   [EMAIL PROTECTED]   http://www.maths.usyd.edu.au/u/psz/
School of Mathematics and Statistics   University of Sydney    Australia


--- /usr/share/perl5/TWiki.pm.orig      2005-04-13 12:33:16.000000000 +1000
+++ /usr/share/perl5/TWiki.pm   2005-09-30 07:19:49.294025095 +1000
@@ -438,6 +438,13 @@
     # PTh 15 Jul 2001: Removed init of $scriptUrlPath based on $theUrl because
     # $theUrl has incorrect URI after failed authentication
 
+# PSz 29 Sep 05
+# Should generate links like http://HOST/CGI/view etc, not
+# http://HOST/view or http://HOST/Main .
+# Initialize:
+$dispScriptUrlPath = $scriptUrlPath;
+$dispViewPath = "/$viewScript";
+
     # initialize preferences, first part for site and web level
     &TWiki::Prefs::initializePrefs( $webName );
 
@@ -3432,6 +3439,14 @@
 
     my @args = buildCommandLine $template, %params;
 
+# PSz 30 Sep 05
+# Command lines are designed for shells, cf. 
+# TWiki.cfg:    ciCmd         => "$rcsDir/ci $rcsArg -q -l 
-m$cmdQuote%COMMENT%$cmdQuote -t-none -w$cmdQuote%USERNAME%$cmdQuote %FILENAME% 
$endRcsCmd",
+# Need to cope with quoted arguments and with final "2>&1".
+# (Funny: we "force" the action of "2>&1" but readFromProcessArray doesn't.)
+s/^(-\w)$cmdQuote(.*)$cmdQuote$/$1$2/ foreach @args;
+pop @args if $args[$#args] eq '2>&1'; # pop @args if " $args[$#args]" eq 
$endRcsCmd;
+
     # The code follows the safe pipe construct found in perlipc(1).
     my $pipe;
     my $pid = open $pipe, '-|';


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to