On Fri, Jul 1, 2011 at 4:48 PM, Paul Slootman <p...@debian.org> wrote:
>> I wondered if you had managed to have a look ?
>
> Now I have.
>
> I tried reproducing your error. I get "/bin/sh: TEST\: not found"
> instead of your "no such file or directory", but tha's probably due to
> differing shells.
>
> It appears that some earlier patches not get it quite right.
> They're labelled "SIS: KHL 2005-02-18 SpacesInSource fix".
> Around line 544 DIRVISH_SRC is set to $env_srctree, which is an escaped
> version of $srctree. However, $srctree (at this point anyway) is already
> sufficiently escaped, it appears. Reverting the changes there fixes it
> for me. The following patch should work:
>
>
> --- /usr/sbin/dirvish.orig 2008-03-08 20:07:34.000000000 +0100
> +++ /usr/sbin/dirvish 2011-07-01 17:47:23.333661517 +0200
> @@ -534,14 +534,10 @@
>
> printf SUMMARY "%s: %s\n", 'Backup-begin', strftime('%Y-%m-%d %H:%M:%S',
> localtime);
>
> -$env_srctree = $srctree; #+SIS:
> -$env_srctree =~ s/ /\\ /g; #+SIS:
> -
> $WRAPPER_ENV = sprintf (" %s=%s" x 5,
> 'DIRVISH_SERVER', $$Options{Server},
> 'DIRVISH_CLIENT', $$Options{client},
> -#-SIS: 'DIRVISH_SRC', $srctree,
> - 'DIRVISH_SRC', $env_srctree, #+SIS:
> + 'DIRVISH_SRC', $srctree,
> 'DIRVISH_DEST', $destree,
> 'DIRVISH_IMAGE', join(':',
> $$Options{vault},
>
>
> Paul
>
Hi,
I know I'm doing something wrong, but I don't have enough experience
to know where I'm going wrong :-(
I created a file called d-patch with the above as its contents
I edited the path from /usr/sbin to /usr/bin on the 1st and 2nd lines
as that's where the Centos package puts it (Dirvish version 1.2.1 on
Centos 5.6)
I did "patch /usr/bin/dirvish d-patch"
It returned
patching file /usr/bin/dirvish
Hunk #1 FAILED at 534.
1 out of 1 hunk FAILED -- saving rejects to file /usr/bin/dirvish.rej
dirvish.rej contains the below
***************
*** 534,547 ****
printf SUMMARY "%s: %s\n", 'Backup-begin', strftime('%Y-%m-%d
%H:%M:%S', localtime);
- $env_srctree = $srctree; #+SIS:
- $env_srctree =~ s/ /\\ /g; #+SIS:
-
$WRAPPER_ENV = sprintf (" %s=%s" x 5,
'DIRVISH_SERVER', $$Options{Server},
'DIRVISH_CLIENT', $$Options{client},
- #-SIS: 'DIRVISH_SRC', $srctree,
- 'DIRVISH_SRC', $env_srctree, #+SIS:
'DIRVISH_DEST', $destree,
'DIRVISH_IMAGE', join(':',
$$Options{vault},
--- 534,543 ----
printf SUMMARY "%s: %s\n", 'Backup-begin', strftime('%Y-%m-%d
%H:%M:%S', localtime);
$WRAPPER_ENV = sprintf (" %s=%s" x 5,
'DIRVISH_SERVER', $$Options{Server},
'DIRVISH_CLIENT', $$Options{client},
+ 'DIRVISH_SRC', $srctree,
'DIRVISH_DEST', $destree,
'DIRVISH_IMAGE', join(':',
$$Options{vault},
_______________________________________________
Dirvish mailing list
Dirvish@dirvish.org
http://www.dirvish.org/mailman/listinfo/dirvish
