Merge pull request #32000 from owncloud/stable10-installed-version

[stable10] Store installed at version
owncloud · Jul 18, 2018 · 55d81e6 · 55d81e6
2 parents 31cecde + 666ba5f
commit 55d81e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/Command/Status.php b/core/Command/Status.php
@@ -40,7 +40,8 @@ protected function configure() {
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$values = [
 			'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
-			'version' => implode('.', \OCP\Util::getVersion()),
+			'first_install_version' => \OC::$server->getConfig()->getAppValue('core', 'first_install_version', 'unknown'),
+			'version' => \implode('.', \OCP\Util::getVersion()),
 			'versionstring' => \OC_Util::getVersionString(),
 			'edition' => \OC_Util::getEditionString(),
 		];

diff --git a/lib/private/Setup.php b/lib/private/Setup.php
@@ -380,6 +380,9 @@ public function install($options) {
 
 			self::installBackgroundJobs();
 
+			// save the origin version that we installed at
+			$config->setAppValue('core', 'first_install_version', \implode('.', \OCP\Util::getVersion()));
+
 			//and we are done
 			$config->setSystemValue('installed', true);
 		}

diff --git a/tests/acceptance/features/bootstrap/BasicStructure.php b/tests/acceptance/features/bootstrap/BasicStructure.php
@@ -937,11 +937,11 @@ public function statusPhpRespondedShouldMatch(PyStringNode $jsonExpected) {
 			= \json_encode(\json_decode($this->response->getBody(), true));
 		if ($this->runOcc(['status']) === 0) {
 			$output = \explode("- ", $this->lastStdOut);
-			$version = \explode(": ", $output[2]);
+			$version = \explode(": ", $output[3]);
 			PHPUnit_Framework_Assert::assertEquals(
 				"version", $version[0]
 			);
-			$versionString = \explode(": ", $output[3]);
+			$versionString = \explode(": ", $output[4]);
 			PHPUnit_Framework_Assert::assertEquals(
 				"versionstring", $versionString[0]
 			);