/[smecontribs]/rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0-bz10564-fixIncludes-longUpdate.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0-bz10564-fixIncludes-longUpdate.patch

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


Revision 1.1 - (show annotations) (download)
Thu Apr 12 01:19:12 2018 UTC (6 years, 6 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_1_0-19_el6_sme, smeserver-nextcloud-1_1_0-13_el6_sme, smeserver-nextcloud-1_1_0-10_el6_sme, smeserver-nextcloud-1_1_0-15_el6_sme, smeserver-nextcloud-1_1_0-8_el6_sme, smeserver-nextcloud-1_1_0-17_el6_sme, smeserver-nextcloud-1_1_0-14_el6_sme, smeserver-nextcloud-1_1_0-20_el6_sme, smeserver-nextcloud-1_1_0-18_el6_sme, smeserver-nextcloud-1_1_0-11_el6_sme, smeserver-nextcloud-1_1_0-21_el6_sme, smeserver-nextcloud-1_1_0-12_el6_sme, smeserver-nextcloud-1_1_0-9_el6_sme, smeserver-nextcloud-1_1_0-16_el6_sme, smeserver-nextcloud-1_1_0-7_el6_sme, HEAD
* Wed Apr 11 2018 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-7.sme
- fix long update [SME: 10564]
- fix IncludeIbay not working.

1 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-occ-conf
2 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2018-04-11 21:14:51.527000000 -0400
3 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2018-04-11 21:15:14.489000000 -0400
4 @@ -159,7 +159,7 @@
5 my @uUsers ;
6 for (@Users) { push @uUsers, $NCusers{$_}; } ;
7 # next if includeI not empty and if not in includeI
8 - next if (scalar(@incI) > 0 && grep(/^$key$/i, @incI) );
9 + next unless (scalar(@incI) == 0 || grep(/^$key$/i, @incI) );
10 # next if in excludeI
11 next if (grep(/^$key$/i, @excI) );
12
13 @@ -246,7 +246,9 @@
14 # we do this on every turn in case it was wrong
15 chown $uid, $gid,"$idir/files/ibays";
16 chmod 0770, "$idir/files/ibays";
17 - OCC "files:scan $user --quiet";
18 + # added --unscanned to avoid to hang on large quantity of file when discovering the newly created ibays folder
19 + # if not enough could add --path $idir/files/ibays
20 + OCC "files:scan $user --quiet --unscanned";
21 # we proceed next only if we want the user homes
22 next unless ($status eq "enabled");
23 # get existing mount

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