From 45aeb978d623b2c61f98efdfc8f0cbcd4fe45b52 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 14 Oct 2016 04:06:45 +0000
Subject: [PATCH] some more logging changes; updated release notes
---
doc/RELEASE_NOTES.txt | 2 +-
setup.sh | 6 ++++++
src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index d1ce21ed..1580203d 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,4 +1,4 @@
-Release 0.14 ()
+Release 0.14 (10/14/2016)
=============================
- Introduced new framework and utilities for synchronizing users with
diff --git a/setup.sh b/setup.sh
index 25c7d179..5bf05917 100644
--- a/setup.sh
+++ b/setup.sh
@@ -105,6 +105,12 @@ if [ -d $postgresqlDir ]; then
export DM_POSTGRESQL_DIR=$postgresqlDir
fi
+# Setup oracle libraries.
+oracleDir=$DM_SUPPORT_DIR/opt/oracle-client/$DM_HOST_ARCH
+if [ -d $oracleDir ]; then
+ LD_LIBRARY_PATH=$oracleDir:$LD_LIBRARY_PATH
+fi
+
# Get back to where we were before invoking the setup script
cd $currentDir
diff --git a/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py b/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py
index 995dae63..b9870b3a 100755
--- a/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py
+++ b/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py
@@ -181,8 +181,8 @@ Description:
# User needs update
try:
self.logger.debug('Modifying LDAP user with badge %s, username %s' % (badge, username))
- self.logger.debug('APS password hash: %s, DM password hash: %s' % (apsPasswordHash, dmPasswordHash))
- self.logger.debug('Encoded DM password hash: %s' % (dmUser['userAttrs']['userPassword'][0]))
+ #self.logger.debug('APS password hash: %s, DM password hash: %s' % (apsPasswordHash, dmPasswordHash))
+ #self.logger.debug('Encoded DM password hash: %s' % (dmUser['userAttrs']['userPassword'][0]))
ldapUserManager.modifyUserInfo(username, ldapModAttrDict)
nUpdatedUsers += 1
except Exception, ex:
--
GitLab