Skip to content

Conversation

@DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Aug 16, 2017

… was disabled in the past

Description

Prio to 10.0 appstoreenable was used as config option to disable installation from apps.owncloud.com

In migration scenarios we respect this value now and do not enable the market app-

Related Issue

fixes owncloud/market#118

How Has This Been Tested?

  • set version in config.php to 9.1.0.0
  • set appstoreenabled to false in config.php
  • run occ up

Screenshots (if appropriate):

bildschirmfoto von 2017-08-16 15-25-38

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@DeepDiver1975 DeepDiver1975 added 3 - To Review backport-request p1-urgent Critical issue, need to consider hotfix with just that issue labels Aug 16, 2017
@DeepDiver1975 DeepDiver1975 added this to the development milestone Aug 16, 2017
@DeepDiver1975 DeepDiver1975 requested a review from PVince81 August 16, 2017 13:28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this code rerun during the next upgrade or only ever when upgrading from any OC < 10.0 version ?

Because I remember that we removed the "appstoreenabled" key after upgrading to 10.0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will trigger this step only for upgrade from oc <10.0 - https://github.com/owncloud/core/blob/6a545053e763a5846cc887a0f66ff15ead7e4f69/lib/private/Repair/Apps.php#L91-L96

is this what you are looking for?

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 looks good otherwise, if the answer to my comment is correct

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this check is used here too ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you leave it then it will be possible to continue using the obsolete "appstoreenabled" config to prevent loading the market app, even if enabled already

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

coming from 9.1 to 10.0.x which ships market app will auto enable the market.
so it is necessary to not load the market app and trigger the update scenarios

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my worry is that this part of the code also runs when updating 10.x to 10.x+1 and might have side effects if someone has "appstoreenable => false" in their config.php despite the fact that we explicitly delete it later. (no $requiresMarketEnable check for this piece).

Unless I misunderstood and this repair step only ever runs once ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I'm getting your point - shall we explicitly disable the market on the initial migration from 9.x.x to 10.x.x ?

@DeepDiver1975 DeepDiver1975 force-pushed the respect-appstoreenabled-when-enabling-marketapp branch from 6a54505 to 5a0d1ba Compare August 16, 2017 13:40
@PVince81
Copy link
Contributor

@DeepDiver1975 #27952

also looks like I didn't backport that one...

@DeepDiver1975 DeepDiver1975 force-pushed the respect-appstoreenabled-when-enabling-marketapp branch from 5a0d1ba to c52b513 Compare August 21, 2017 10:36
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deepdiver hmm, so if people keep "appstoreenabled" to false in config.php, every update will re-disable the market app ?
maybe we should delete the key after all?
unless you make sure that this block only every runs when upgrading from 9.x
then never again

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let me try something ....

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approach looks good 👍

Please fix the wording and optionally the minor issue about doc link

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hard-coded 10.0 ? I think we have a router method somewhere for pointing at docs ?

Minor issue, feel free to ignore

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take care off ...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=> If you would like to

… was disabled in the past - fixes owncloud/market#118

Disable market app if 'appstoreenabled' was set to false in config

Handle 'has_internet_connection' and cleanup of market app handling
@DeepDiver1975 DeepDiver1975 force-pushed the respect-appstoreenabled-when-enabling-marketapp branch from e214e91 to 4fcbdc7 Compare August 21, 2017 15:12
@DeepDiver1975 DeepDiver1975 merged commit bafdb42 into master Aug 21, 2017
@DeepDiver1975 DeepDiver1975 deleted the respect-appstoreenabled-when-enabling-marketapp branch August 21, 2017 19:48
@lock
Copy link

lock bot commented Aug 2, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

3 - To Review p1-urgent Critical issue, need to consider hotfix with just that issue status/STALE

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don't enable market app when trying an offline upgrade (9.1.4 -> 10.0.2)

4 participants