[Pkg-owncloud-commits] [owncloud] 16/85: bump version and don't overwrite values on next update if not necessary

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 313324a7b459b59aefaca4fe1b648489971cdad2
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed May 14 13:27:23 2014 +0200

    bump version and don't overwrite values on next update if not necessary
---
 apps/user_ldap/appinfo/update.php | 33 +++++++++++++++++++++------------
 apps/user_ldap/appinfo/version    |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 8bf532f..47cc566 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -17,19 +17,28 @@ $configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true)
 $ldap = new OCA\user_ldap\lib\LDAP();
 foreach($configPrefixes as $config) {
 	$connection = new OCA\user_ldap\lib\Connection($ldap, $config);
-	$value = \OCP\Config::getAppValue('user_ldap',
-									  $config.'ldap_uuid_attribute', 'auto');
-	\OCP\Config::setAppValue('user_ldap',
-							 $config.'ldap_uuid_user_attribute', $value);
-	\OCP\Config::setAppValue('user_ldap',
-							 $config.'ldap_uuid_group_attribute', $value);
 
-	$value = \OCP\Config::getAppValue('user_ldap',
-									  $config.'ldap_expert_uuid_attr', 'auto');
-	\OCP\Config::setAppValue('user_ldap',
-							 $config.'ldap_expert_uuid_user_attr', $value);
-	\OCP\Config::setAppValue('user_ldap',
-							 $config.'ldap_expert_uuid_group_attr', $value);
+	$state = \OCP\Config::getAppValue(
+		'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing');
+	if($state === 'non existing') {
+		$value = \OCP\Config::getAppValue(
+			'user_ldap', $config.'ldap_uuid_attribute', 'auto');
+		\OCP\Config::setAppValue(
+			'user_ldap', $config.'ldap_uuid_user_attribute', $value);
+		\OCP\Config::setAppValue(
+			'user_ldap', $config.'ldap_uuid_group_attribute', $value);
+	}
+
+	$state = \OCP\Config::getAppValue(
+		'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing');
+	if($state === 'non existing') {
+		$value = \OCP\Config::getAppValue(
+			'user_ldap', $config.'ldap_expert_uuid_attr', 'auto');
+		\OCP\Config::setAppValue(
+			'user_ldap', $config.'ldap_expert_uuid_user_attr', $value);
+		\OCP\Config::setAppValue(
+			'user_ldap', $config.'ldap_expert_uuid_group_attr', $value);
+	}
 
 	if($enableRawMode) {
 		\OCP\Config::setAppValue('user_ldap', $config.'ldap_user_filter_mode', 1);
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 44bb5d1..2b7c5ae 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.1
\ No newline at end of file
+0.4.2

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