[Bps-public-commit] RT-Extension-LDAPImport branch, master, updated. 0.33-5-g445ee63

[Thomas Sibley]

The branch, master has been updated
       via  445ee63ace750aa0f3e53d9fdc9c044132185cd2 (commit)
       via  787bc18e0a6677ab21afb15703edc05460198d79 (commit)
      from  22b0995c834a6954c030eaee794277132a36c7b6 (commit)

Summary of changes:
 Changes                        |  5 +++++
 META.yml                       |  2 +-
 inc/Module/Install/RTx.pm      | 30 +++++-------------------------
 lib/RT/Extension/LDAPImport.pm |  2 +-
 4 files changed, 12 insertions(+), 27 deletions(-)

- Log -----------------------------------------------------------------
commit 787bc18e0a6677ab21afb15703edc05460198d79
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Oct 22 11:00:34 2012 -0700

    Update M::I

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 73b9cda..2eba7ad 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.29';
+our $VERSION = '0.29_02';
 
 use FindBin;
 use File::Glob     ();
@@ -129,18 +129,7 @@ install ::
 
     my %has_etc;
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/schema.*") ) {
-
-        # got schema, load factory module
         $has_etc{schema}++;
-        $self->load('RTxFactory');
-        $self->postamble(<< ".");
-factory ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name))"
-
-dropdb ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name drop))"
-
-.
     }
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/acl.*") ) {
         $has_etc{acl}++;
@@ -164,28 +153,19 @@ dropdb ::
         print "For first-time installation, type 'make initdb'.\n";
         my $initdb = '';
         $initdb .= <<"." if $has_etc{schema};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{acl};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{initialdata};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert \$(NAME) \$(VERSION)))"
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
     }
 }
 
-sub RTxInit {
-    unshift @INC, substr( delete( $INC{'RT.pm'} ), 0, -5 ) if $INC{'RT.pm'};
-    require RT;
-    RT::LoadConfig();
-    RT::ConnectToDatabase();
-
-    die "Cannot load RT" unless $RT::Handle and $RT::DatabaseType;
-}
-
 # stolen from RT::Handle so we work on 3.6 (cmp_versions came in with 3.8)
 { my %word = (
     a     => -4,
@@ -228,4 +208,4 @@ sub requires_rt {
 
 __END__
 
-#line 348
+#line 328

commit 445ee63ace750aa0f3e53d9fdc9c044132185cd2
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Oct 22 11:02:20 2012 -0700

    Dev release 0.33_01

diff --git a/Changes b/Changes
index 694f031..9bbc7cd 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for RT-Extension-LDAPImport
 
+0.33_01
+    Bug fix: Avoid flip flopping fields back and forth with
+    RT::Authen::ExternalAuth by using our own update function instead of
+    RT::Record->Update
+
 0.33
     Bug fix: Actually disable RT::Authen::ExternalAuth while importing users from LDAP
 
diff --git a/META.yml b/META.yml
index a699ba1..d3e3000 100644
--- a/META.yml
+++ b/META.yml
@@ -28,4 +28,4 @@ requires:
   Test::More: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.33
+version: 0.33_01
diff --git a/lib/RT/Extension/LDAPImport.pm b/lib/RT/Extension/LDAPImport.pm
index 45920de..aa01314 100644
--- a/lib/RT/Extension/LDAPImport.pm
+++ b/lib/RT/Extension/LDAPImport.pm
@@ -1,6 +1,6 @@
 package RT::Extension::LDAPImport;
 
-our $VERSION = '0.33';
+our $VERSION = '0.33_01';
 
 use warnings;
 use strict;

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