[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-48-g83c14ba

[David Prévot]

The following commit has been merged in the master branch:
commit 96eca24e7e859e4bcab4419617b929578e7db11e
Author: David Prévot <taffit at debian.org>
Date:   Mon Mar 25 17:15:42 2013 -0400

    Fix more appstoreenabled and apps path

diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 911009e..7458d94 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -3,7 +3,7 @@ Description: Disable the app store
 Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-03-24
+Last-Update: 2013-03-25
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -83,6 +83,8 @@
@@ -11,7 +11,7 @@ Last-Update: 2013-03-24
  			OC_Config::setValue('dbtype', $dbtype);
  			OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 +			OC_Config::setValue('appstoreenabled', false);
-+			OC_Config::setValue('apps_paths', array('writable' => false));
++			OC_Config::setValue('apps_paths', array(array('path'=> '/usr/share/owncloud/apps','url' => '/apps','writable' => false)));
  			if($dbtype == 'mysql') {
  				$dbuser = $options['dbuser'];
  				$dbpass = $options['dbpass'];
@@ -105,3 +105,27 @@ Last-Update: 2013-03-24
  	OCP\JSON::success(array('type' => 'external', 'data' => array()));
  }
  
+--- a/lib/util.php
++++ b/lib/util.php
+@@ -189,7 +189,7 @@
+ 		}
+ 
+ 		// Check if there is a writable install folder.
+-		if(OC_Config::getValue('appstoreenabled', true)) {
++		if(OC_Config::getValue('appstoreenabled', false)) {
+ 			if( OC_App::getInstallPath() === null
+ 				|| !is_writable(OC_App::getInstallPath())
+ 				|| !is_readable(OC_App::getInstallPath()) ) {
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -177,8 +177,8 @@
+ 					OC::$APPSROOTS[] = $paths;
+ 				}
+ 			}
+-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+-			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
++		} elseif (file_exists('/usr/share/owncloud/apps')) {
++			OC::$APPSROOTS[] = array('path' => '/usr/share/owncloud/apps', 'url' => '/apps', 'writable' => false);
+ 		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+ 			OC::$APPSROOTS[] = array(
+ 				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',

-- 
owncloud.git