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

Contents of /rpms/smeserver-shared-folders/contribs7/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 - (show annotations) (download)
Thu Dec 15 15:14:13 2011 UTC (12 years, 11 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-63_el4_sme, smeserver-shared-folders-0_1-65_el4_sme, smeserver-shared-folders-0_1-62_el4_sme, smeserver-shared-folders-0_1-64_el4_sme, smeserver-shared-folders-0_1-61_el4_sme, smeserver-shared-folders-0_1-73_el4_sme, smeserver-shared-folders-0_1-71_el4_sme, smeserver-shared-folders-0_1-72_el4_sme, smeserver-shared-folders-0_1-77_el4_sme, smeserver-shared-folders-0_1-70_el4_sme, smeserver-shared-folders-0_1-75_el4_sme, smeserver-shared-folders-0_1-76_el4_sme, smeserver-shared-folders-0_1-68_el4_sme, smeserver-shared-folders-0_1-74_el4_sme, smeserver-shared-folders-0_1-79_el4_sme, smeserver-shared-folders-0_1-69_el4_sme, smeserver-shared-folders-0_1-78_el4_sme, smeserver-shared-folders-0_1-67_el4_sme, smeserver-shared-folders-0_1-66_el4_sme, HEAD
* Thu Dec 15 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-61.sme
- Hide Recycle Bin dir if recycle is disabled

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