summaryrefslogtreecommitdiffstats
path: root/lib/private/updater.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-07-23 23:38:17 +0200
committerVincent Petry <pvince81@owncloud.com>2014-07-23 23:38:17 +0200
commit6f329dcb6cc535113fb45dd07f60a075a97a6db0 (patch)
treec81cb32a9d8ac664b37cc8aa5809869019f05fff /lib/private/updater.php
parent9834e3854201d68fbd5dcbef09122c48cc5bcb10 (diff)
downloadnextcloud-server-6f329dcb6cc535113fb45dd07f60a075a97a6db0.tar.gz
nextcloud-server-6f329dcb6cc535113fb45dd07f60a075a97a6db0.zip
Set version AFTER a successful update
If an app upgrade failed, the core version will not be increased either in the database. This will re-display the update page and make it possible to redo the apps upgrade. Note that any core repair routine must take into account that an update might need to be redone again even though the core's DB state is already the one of the new version.
Diffstat (limited to 'lib/private/updater.php')
-rw-r--r--lib/private/updater.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php
index d50c2554c75..7acd6446ec4 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -212,8 +212,6 @@ class Updater extends BasicEmitter {
\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
$this->emit('\OC\Updater', 'dbUpgrade');
- // TODO: why not do this at the end ?
- \OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
$disabledApps = \OC_App::checkAppsRequirements();
if (!empty($disabledApps)) {
$this->emit('\OC\Updater', 'disabledApps', array($disabledApps));
@@ -227,6 +225,9 @@ class Updater extends BasicEmitter {
//Invalidate update feed
\OC_Appconfig::setValue('core', 'lastupdatedat', 0);
+
+ // only set the final version if everything went well
+ \OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
}
}
}