[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-83-ge6e7a67

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 6b4a58e26b91257c9ef98afd9c4cd1514e267d41
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sun May 20 01:23:02 2012 +0200

    one more path to be patched

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 61b0b85..5995b56 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -43,7 +43,7 @@ Last-Update: <2011-11-16>
  			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 --- a/lib/util.php
 +++ b/lib/util.php
-@@ -17,8 +17,8 @@
+@@ -17,11 +17,11 @@
  			return false;
  		}
  
@@ -53,7 +53,11 @@ Last-Update: <2011-11-16>
 +		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" );
  
  		// Check if config folder is writable.
- 		if(!is_writable(OC::$SERVERROOT."/config/")) {
+-		if(!is_writable(OC::$SERVERROOT."/config/")) {
++		if(!is_writable("/var/lib/owncloud/config/")) {
+ 			$tmpl = new OC_Template( '', 'error', 'guest' );
+ 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+ 			$tmpl->printPage();
 @@ -191,8 +191,8 @@
  	 * @return array arrays with error messages and hints
  	 */
@@ -64,7 +68,7 @@ Last-Update: <2011-11-16>
 +		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" );
  		$CONFIG_INSTALLED = OC_Config::getValue( "installed", false );
  		$errors=array();
- 
+
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -3,7 +3,7 @@

-- 
owncloud.git