Re: Use of --trim in rsyncrypto 1.13

[Julien M. <ru...@ru...>]

Le 03/09/2017 à 17:35, Shachar Shemesh a écrit :
> On 29/08/17 10:47, Julien Métairie wrote:
>> Hi everybody,
>>
>> I just upgraded from rsyncrypto v1.12 to v1.13, and I am stuck with the --trim argument.
>>
>> Here is my cmdline :
>> rsyncrypto --delete --delete-keys --changed --trim 2 --filelist list.txt . /mnt/backup/ /home/ruliane/keyfiles/ /home/ruliane/backup.crt
>>
>> Content of list.txt :
>> /home/ruliane/nas/Logiciels/Keys.txt
>> /home/ruliane/nas/Multimedia/Clips/
>>
>>
>> I obtain the following :
>> /mnt/backup/Clips/file1.avi
>> /mnt/backup/nas/Logiciels/Keys.txt
>>
>>
>> It seems that the --trim option does not give the same result with folders and files. I expected the following :
>> /mnt/backup/nas/Multimedia/Clips/file1.avi
>> /mnt/backup/nas/Logiciels/Keys.txt
>>
>>
>> My cmdline worked well with rsyncrypto v1.12. Since I upgraded to v1.13, according to the manpage, I added the dot "." as a first argument. What should I do to get the old behavior ?
> Hello Julien,
>
> Can you please apply the following patch and let me know if it solves 
> the problem for you?
>
> Index: file.cpp
> ===================================================================
> --- file.cpp    (revision 603)
> +++ file.cpp    (working copy)
> @@ -151,7 +151,7 @@
>                  if( VERBOSE(1) )
>                      std::cerr<<opname<<" directory: 
> "<<srcname<<std::endl;
>
> -                real_dir_encrypt( src.c_str(), trim_offset, dst_dir, 
> key_dir, rsa_key, op, opname, dstnameop,
> +                real_dir_encrypt( src.c_str(), 0, dst_dir, key_dir, 
> rsa_key, op, opname, dstnameop,
>                          keynameop );
>              }
>          } catch( const delayed_error & ) {
>
> Thanks,
> Shachar
>
>

Hi Shachar,

Thank you for this fix. I can't test it right now and I use it on a 
Debian server, where only Debian packages are used. I downgraded to 
v1.12 (using Jessie repo) but be sure I will be happy to switch to v1.14 
as soon as I can.
Once again, many thanks for your work.

Regards,
Julien