[Pkg-owncloud-commits] [owncloud] 05/06: Do not test the .htaccess version on install

[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 633d7579bb992cc88a0e2d5f8bc9d46586d708b6
Author: David Prévot <taffit at debian.org>
Date:   Mon Mar 30 21:44:52 2015 -0400

    Do not test the .htaccess version on install
---
 .../0004-Make-isCurrentHtaccess-a-noop.patch       | 30 ++++++++++++++++++++++
 ...0008-use-JSqueeze-instead-of-JSMin-13052.patch} |  0
 ...dk-path.patch => 0005-Adapt-aws-sdk-path.patch} |  0
 ...=> 0006-Adapt-google-api-php-client-path.patch} |  0
 ...ox-path.patch => 0007-Adapt-Dropbox-path.patch} |  0
 debian/patches/series                              |  9 ++++---
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
new file mode 100644
index 0000000..348a846
--- /dev/null
+++ b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Mon, 30 Mar 2015 21:26:22 -0400
+Subject: Make isCurrentHtaccess a noop
+
+Since .htaccess is a conffile, no need to add another failsafe on install.
+
+Forwarded: not-needed
+---
+ lib/private/setup.php | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/lib/private/setup.php b/lib/private/setup.php
+index e3a29b6..69c9c62 100644
+--- a/lib/private/setup.php
++++ b/lib/private/setup.php
+@@ -256,13 +256,7 @@ class OC_Setup {
+ 	 * @return bool
+ 	 */
+ 	private function isCurrentHtaccess() {
+-		$version = \OC_Util::getVersion();
+-		unset($version[3]);
+-
+-		return !strpos(
+-			file_get_contents($this->pathToHtaccess()),
+-			'Version: '.implode('.', $version)
+-		) === false;
++		return true;
+ 	}
+ 
+ 	/**
diff --git a/debian/patches/0007-use-JSqueeze-instead-of-JSMin-13052.patch b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
similarity index 100%
rename from debian/patches/0007-use-JSqueeze-instead-of-JSMin-13052.patch
rename to debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
diff --git a/debian/patches/path/0004-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
similarity index 100%
rename from debian/patches/path/0004-Adapt-aws-sdk-path.patch
rename to debian/patches/path/0005-Adapt-aws-sdk-path.patch
diff --git a/debian/patches/path/0005-Adapt-google-api-php-client-path.patch b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
similarity index 100%
rename from debian/patches/path/0005-Adapt-google-api-php-client-path.patch
rename to debian/patches/path/0006-Adapt-google-api-php-client-path.patch
diff --git a/debian/patches/path/0006-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
similarity index 100%
rename from debian/patches/path/0006-Adapt-Dropbox-path.patch
rename to debian/patches/path/0007-Adapt-Dropbox-path.patch
diff --git a/debian/patches/series b/debian/patches/series
index be16a1c..f5e57ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
 0001-Disable-the-appstore.patch
 0002-Fix-displayed-version.patch
 0003-Improve-logfile-handling.patch
-path/0004-Adapt-aws-sdk-path.patch
-path/0005-Adapt-google-api-php-client-path.patch
-path/0006-Adapt-Dropbox-path.patch
-0007-use-JSqueeze-instead-of-JSMin-13052.patch
+0004-Make-isCurrentHtaccess-a-noop.patch
+path/0005-Adapt-aws-sdk-path.patch
+path/0006-Adapt-google-api-php-client-path.patch
+path/0007-Adapt-Dropbox-path.patch
+0008-use-JSqueeze-instead-of-JSMin-13052.patch

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