/[smecontribs]/rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders-0.1-hide_trash_if_disabled.patch
ViewVC logotype

Annotation of /rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders-0.1-hide_trash_if_disabled.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sun Oct 13 15:04:38 2013 UTC (11 years, 1 month ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-83_el6_sme, smeserver-shared-folders-0_1-81, smeserver-shared-folders-0_1-82_el6_sme, smeserver-shared-folders-0_1-80_el6
Initial import

1 vip-ire 1.1 diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin
2     --- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2011-12-15 13:46:50.000000000 +0100
3     +++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2011-12-15 15:26:47.000000000 +0100
4     @@ -1,11 +1,15 @@
5     {
6     - $OUT = "";
7     - return if (($share->prop('RecycleBin') || 'disabled') eq 'disabled');
8     -
9     - $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ? "True" : "False";
10     - $share_vfs->{recycle}->{repository} = ($share->prop('RecycleBinDir') || "Recycle Bin");
11     - $share_vfs->{recycle}->{keeptree} = "True";
12     - $share_vfs->{recycle}->{touch} = "True";
13     - $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*";
14     - $share_vfs->{recycle}->{exclude_dir} = "tmp,temp,cache";
15     + my $recycle = $share->prop('RecycleBinDir') || "Recycle Bin";
16     + if (($share->prop('RecycleBin') || 'disabled') eq 'disabled'){
17     + $OUT .= "veto files = /" . $recycle ."/\n";
18     + }
19     + else{
20     + $OUT .= '';
21     + $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ? "True" : "False";
22     + $share_vfs->{recycle}->{repository} = $recycle;
23     + $share_vfs->{recycle}->{keeptree} = "True";
24     + $share_vfs->{recycle}->{touch} = "True";
25     + $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*";
26     + $share_vfs->{recycle}->{exclude_dir} = "tmp,temp,cache";
27     + }
28     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed