[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.0debian-3-9-gd503901

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit d50390172e0ba6f3b1ac9d3ba414a74ef68aa904
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 5 00:40:08 2012 +0200

    Updated 05_no_app_store.diff to only check whether the /apps dir is writable when the appstore is enabled

diff --git a/debian/changelog b/debian/changelog
index c074acd..cdbfdf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ owncloud (4.0.1debian-1) UNRELEASED; urgency=low
   * New upstream bugfix release.
   * debian/control: replaced suggest on postgresql-server by
     postgresql-client for the owncloud-pgsql package.
-  * debian/patches: dropped 04_fix_odfviewer.diff and
-    06_add_head_support_for_download.diff; applied by upstream.
+  * debian/patches: 
+    - Dropped 04_fix_odfviewer.diff and
+      06_add_head_support_for_download.diff; applied by upstream.
+    - Updated 05_no_app_store.diff to only check whether the /apps dir is
+      writable when the appstore is enabled.
   * debian/rules:
     - Don't install l10n/init.sh.
     - Make sure that /etc/owncloud/htaccess is owned by www-data, as
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 4eeff85..485e044 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -77,6 +77,7 @@ class OC_Setup {
+@@ -77,6 +77,7 @@
  			OC_Config::setValue('datadirectory', $datadir);
   			OC_Config::setValue('dbtype', $dbtype);
   			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
@@ -13,3 +13,14 @@ Forwarded: not-needed
  			if($dbtype == 'mysql') {
  				$dbuser = $options['dbuser'];
  				$dbpass = $options['dbpass'];
+--- a/lib/util.php
++++ b/lib/util.php
+@@ -29,7 +29,7 @@
+ 		}
+ 
+ 		// Check if apps folder is writable.
+-		if(!is_writable(OC::$SERVERROOT."/apps/")) {
++		if(OC_Config::getValue( "appstoreenabled", false ) && !is_writable(OC::$SERVERROOT."/apps/")) {
+ 			$tmpl = new OC_Template( '', 'error', 'guest' );
+ 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+ 			$tmpl->printPage();

-- 
owncloud.git