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

David Prévot taffit at debian.org
Sun Mar 24 22:53:22 UTC 2013


The following commit has been merged in the master branch:
commit a1d78572d2b3d3db465231acbe9eb48e5e07a3a9
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 24 18:13:01 2013 -0400

    Fix typos introduced in 094e29b

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 9f6eee0..34634af 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -81,7 +81,7 @@ Last-Update: 2013-03-24
  		$fullPath = array_values(self::getDirectories());
  		$fullPath[] = rtrim(App::getBackupBase(), '/');
 -		$fullPath[] = \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" );
-+		$fullPath[] = \OC_Config::getValue( "datadirectory", \"/var/lib/owncloud/data" );
++		$fullPath[] = \OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
  		
  		$exclusions = array(
  			'full' => $fullPath,
@@ -180,7 +180,7 @@ Last-Update: 2013-03-24
  				} else {
  					$homedir = \OCP\Config::getSystemValue('datadirectory',
 -						\OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
-+						\'/var/lib/owncloud/data' ) . '/' . $homedir[0];
++						'/var/lib/owncloud/data' ) . '/' . $homedir[0];
  				}
  				$this->connection->writeToCache($cacheKey, $homedir);
  				return $homedir;
@@ -233,7 +233,7 @@ Last-Update: 2013-03-24
  		$root = \OC_User::getHome($user);
  		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
 -		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
-+		$datadir = \OC_Config::getValue("datadirectory", \"/var/lib/owncloud/data");
++		$datadir = \OC_Config::getValue("datadirectory", "/var/lib/owncloud/data");
  
  		//move config file to it's new position
 -		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
@@ -284,7 +284,7 @@ Last-Update: 2013-03-24
  	 */
  	public static function getBackupBase() {
 -		return \OC::$SERVERROOT . '/backup/';
-+		return \'/var/lib/owncloud/backup';
++		return '/var/lib/owncloud/backup/';
  	}
  
  	public static function getSource($url, $version) {

-- 
owncloud.git



More information about the Pkg-owncloud-commits mailing list