Skip users with no trashbin #22628

Merged
merged 1 commit into from Feb 25, 2016

Projects

None yet

7 participants

@VicDeo
Member
VicDeo commented Feb 24, 2016

Fix the first log entry from #22450

@VicDeo VicDeo Skip users with no trashbin
aac6932
@VicDeo VicDeo added this to the 8.2.4-next-maintenance milestone Feb 24, 2016
@mention-bot

By analyzing the blame information on this pull request, we identified @LukasReschke, @MorrisJobke and @DeepDiver1975 to be potential reviewers

@VicDeo
Member
VicDeo commented Feb 24, 2016

@cdamken Please test

@MorrisJobke MorrisJobke commented on the diff Feb 24, 2016
apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -120,6 +120,12 @@ private function setupFS($user){
return false;
}
+ //Check if this user has a trashbin directory
+ $view = new \OC\Files\View('/' . $user);
@MorrisJobke
MorrisJobke Feb 24, 2016 Member

@icewind1991 Does this also work for users with different home folder name?

@schiessle
schiessle Feb 24, 2016 Member

yes, all home folders are mount to data/user... Otherwise all the other views we use all over core and the apps would fails as well

@schiessle
schiessle Feb 24, 2016 Member

@VicDeo Wouldn't it make sense to inject the view in the constructor? This would allow us to write unit tests for the method.

@schiessle
Member

beside my comments above this looks good 👍

@schiessle
Member

@VicDeo why only 8.2.4-next? I think we can add the fix to the current maintenance release 8.2.3 which will happen in march and of course also for 9.0

@cdamken
Contributor
cdamken commented Feb 24, 2016

@cdamken Please test

Works! no trashbin error anymore 👍

@DeepDiver1975 DeepDiver1975 merged commit 29e3c4a into master Feb 25, 2016

21 of 22 checks passed

server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #7532 found unstable in 4 min 14 sec
Details
Scrutinizer No new issues
Details
cla-bot-core Build #1670 succeeded in 12 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #58490 succeeded in 23 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #52421 succeeded in 12 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #27200 succeeded in 19 min
Details
core-ci-linux/database=oci,label=SLAVE Build #27200 succeeded in 1 hr 0 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #27200 succeeded in 22 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #27200 succeeded in 13 min
Details
ocs-api-integration-tests-ci Build #7768 succeeded in 6 min 0 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #7532 succeeded in 1 min 12 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #7532 succeeded in 7 min 19 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #7845 succeeded in 2 min 22 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #35213 succeeded in 3 min 17 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 4 min 59 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 6 min 56 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 32 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 30 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 23 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 34 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #11843 succeeded in 9 min 36 sec
Details
@DeepDiver1975 DeepDiver1975 deleted the fix-thrashbin-cronjob branch Feb 25, 2016
@MorrisJobke
Member

@karlitschek @VicDeo Should we backport this to stable8.2?

@karlitschek
Member

please backport 👍

@MorrisJobke
Member

@VicDeo Could you create the backport PR? Thanks :)

@VicDeo
Member
VicDeo commented Feb 26, 2016

@MorrisJobke backport is in #22685

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment