[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.10-4-ga4f7cb9

[Alex Vandiver]

The branch, master has been updated
       via  a4f7cb9778adb6632caacf08bcc4f6ae4f7b8376 (commit)
      from  f8cfbe5f4ed1ca5abd00130961ebbaabc4435a86 (commit)

Summary of changes:
 inc/Module/Install/RTx.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a4f7cb9778adb6632caacf08bcc4f6ae4f7b8376
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Sep 24 14:21:53 2013 -0400

    Update inc/

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index c9fe996..ac04c79 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.31';
+our $VERSION = '0.32';
 
 use FindBin;
 use File::Glob     ();
@@ -136,6 +136,7 @@ install ::
         $has_etc{acl}++;
     }
     if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
+    if ( -d 'etc/upgrade/' )    { $has_etc{upgrade}++; }
 
     $self->postamble("$postamble\n");
     unless ( $subdirs{'lib'} ) {
@@ -164,6 +165,12 @@ install ::
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
+        if ($has_etc{upgrade}) {
+            print "To upgrade from a previous version of this extension, use 'make upgrade-database'\n";
+            my $upgradedb = qq|\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(upgrade \$(NAME) \$(VERSION)))"\n|;
+            $self->postamble("upgrade-database ::\n$upgradedb\n");
+            $self->postamble("upgradedb ::\n$upgradedb\n");
+        }
     }
 }
 
@@ -209,4 +216,4 @@ sub requires_rt {
 
 __END__
 
-#line 329
+#line 336

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