[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.1-226-gb23fd9c

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  b23fd9c987564df2d7b6643b4cbd4492fdcbdae6 (commit)
       via  ae1de8b0b876dcebe3f5b82fb474ec7ee2dda567 (commit)
       via  1d3d0d6fe6e4cabbbb9ed4e9fdfac730ebc68a56 (commit)
       via  948d76dfd9398d5c98576357e8114c3ae4216728 (commit)
       via  9dcd1a04f72230e802d13e5ee9279dbac08af65e (commit)
       via  82e1a4b08154facdcdf91081a07028274ff3afef (commit)
       via  ac755a40430963fa282a4dd464a50bdbed1fca1e (commit)
      from  78bed8debdccf3723668d4f9e60ede336ce80a18 (commit)

Summary of changes:
 lib/RT/Interface/CLI.pm |  6 ++++++
 lib/RT/LDAPImport.pm    |  8 +++----
 sbin/rt-ldapimport.in   | 56 ++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 50 insertions(+), 20 deletions(-)

- Log -----------------------------------------------------------------
commit 1d3d0d6fe6e4cabbbb9ed4e9fdfac730ebc68a56
Author: Alex Vandiver <alex at chmrr.net>
Date:   Wed Jan 4 23:28:49 2017 -0800

    The information is "debug information" -- "verbose information" sounds odd

diff --git a/lib/RT/LDAPImport.pm b/lib/RT/LDAPImport.pm
index e2aaa81..ccb51c8 100644
--- a/lib/RT/LDAPImport.pm
+++ b/lib/RT/LDAPImport.pm
@@ -350,7 +350,7 @@ Executing C<rt-ldapimport> will run a test that connects to your LDAP server
 and prints out a list of the users found. To see more about these users,
 and to see more general debug information, include the C<--verbose> flag.
 
-That verbose information is also sent to the RT log with the debug level.
+That debug information is also sent to the RT log with the debug level.
 Errors are logged to the screen and to the RT log.
 
 Executing C<rt-ldapimport> with the C<--import> flag will cause it to import

commit ae1de8b0b876dcebe3f5b82fb474ec7ee2dda567
Author: Alex Vandiver <alex at chmrr.net>
Date:   Wed Jan 4 23:29:38 2017 -0800

    Unwrap the example lines, for better readability

diff --git a/lib/RT/LDAPImport.pm b/lib/RT/LDAPImport.pm
index ccb51c8..bd731db 100644
--- a/lib/RT/LDAPImport.pm
+++ b/lib/RT/LDAPImport.pm
@@ -89,12 +89,10 @@ In C<RT_SiteConfig.pm>:
 Running the import:
 
     # Run a test import
-    /opt/rt4/sbin/rt-ldapimport \
-    --verbose > ldapimport.debug 2>&1
+    /opt/rt4/sbin/rt-ldapimport --verbose > ldapimport.debug 2>&1
     
     # Run for real, possibly put in cron
-    /opt/rt4/sbin/rt-ldapimport \
-    --import
+    /opt/rt4/sbin/rt-ldapimport --import
 
 =head1 CONFIGURATION
 

commit b23fd9c987564df2d7b6643b4cbd4492fdcbdae6
Merge: 78bed8d ae1de8b
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Jan 5 20:49:06 2017 +0000

    Merge branch '4.4/ldapimporter-debug-backcompat' into 4.4-trunk


-----------------------------------------------------------------------