[Pkg-owncloud-commits] [owncloud] 35/69: Don’t stop update over several major versions

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit cb2556b3caee944d4e9b992f0648cff2802668df
Author: David Prévot <taffit at debian.org>
Date:   Sun Nov 8 15:54:43 2015 -0400

    Don’t stop update over several major versions
---
 ...t-stop-update-over-several-major-versions.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/0009-Don-t-stop-update-over-several-major-versions.patch b/debian/patches/0009-Don-t-stop-update-over-several-major-versions.patch
new file mode 100644
index 0000000..79db737
--- /dev/null
+++ b/debian/patches/0009-Don-t-stop-update-over-several-major-versions.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Sun, 8 Nov 2015 15:52:14 -0400
+Subject: =?utf-8?q?Don=E2=80=99t_stop_update_over_several_major_versions?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Even if it is not supported upstream, we’re doing our best to offer it
+to our users.
+---
+ lib/private/updater.php | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/lib/private/updater.php b/lib/private/updater.php
+index 9e5207c..b29b645 100644
+--- a/lib/private/updater.php
++++ b/lib/private/updater.php
+@@ -279,12 +279,6 @@ class Updater extends BasicEmitter {
+ 	 * @return bool true if the operation succeeded, false otherwise
+ 	 */
+ 	private function doUpgrade($currentVersion, $installedVersion) {
+-		// Stop update if the update is over several major versions
+-		$allowedPreviousVersion = $this->getAllowedPreviousVersion();
+-		if (!self::isUpgradePossible($installedVersion, $currentVersion, $allowedPreviousVersion)) {
+-			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
+-		}
+-
+ 		// Update .htaccess files
+ 		try {
+ 			Setup::updateHtaccess();
diff --git a/debian/patches/series b/debian/patches/series
index 88a96a0..82db5a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ path/0005-Adapt-aws-sdk-path.patch
 path/0006-Adapt-google-api-php-client-path.patch
 path/0007-Adapt-Dropbox-path.patch
 0008-Drop-useless-fallback.patch
+0009-Don-t-stop-update-over-several-major-versions.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git