[Bps-public-commit] RT-Extension-rt_cpan_org branch, rt4, updated. 2b9ad7912f42078835f6f2a3baa8344072ee57ee

[Thomas Sibley]

The branch, rt4 has been updated
       via  2b9ad7912f42078835f6f2a3baa8344072ee57ee (commit)
       via  09486c8c967650522a0a085d8126be3c98358f81 (commit)
       via  f2ac72f518086d83312da001967438b5b945252c (commit)
       via  d55c00c47773e17d95d3dd760cd0f6eb90e48671 (commit)
       via  a838a3d4649e1dbcfbd9469ac031d8f1dc26e469 (commit)
      from  784eb980473a3deba26f34988c0cc808b0d97498 (commit)

Summary of changes:
 bin/pull-live | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit a838a3d4649e1dbcfbd9469ac031d8f1dc26e469
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 12:02:40 2013 -0700

    Remove a redundant variable in favor a better named one

diff --git a/bin/pull-live b/bin/pull-live
index 943eee2..97d71bf 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -15,11 +15,11 @@ sub skip($);
 
 my $perl = $ENV{'PERL'} = $^X;
 
-my $root = $ENV{'RTHOME'} = $rthome;
+$ENV{'RTHOME'} = $rthome;
 
 unless ($batch) {
     print <<SANITY_CHECK;
-RT:   $root
+RT:   $rthome
 Perl: $perl
 
 Press enter to continue or ^C to abort.
@@ -28,7 +28,7 @@ SANITY_CHECK
 }
 
 my $rt_opts =
-     " --prefix=$root"
+     " --prefix=$rthome"
     ." --with-db-type=mysql"
     ." --with-db-host=''" # connect via socket
     ." --with-db-port=3307"
@@ -115,14 +115,14 @@ foreach my $module (@UPDATE) {
 
 # adjust bugs-per-dist.data and queue-addresses
 foreach my $path (qw(/local/plugins/RT-Extension-rt_cpan_org/html/Public/bugs-per-dist.data /local/plugins/RT-Extension-rt_cpan_org/html/NoAuth/cpan)) {
-    my $f = $root . $path;
+    my $f = $rthome . $path;
     `touch $f` unless -e $f;
     ($_ = `chown -R rtcpan:rtcpan $f`)
         or !$? or die "$_\n\nCouldn't change owner of '$f'";
 }
 
 # clean mason cache
-($_ = `rm -fr $root/var/mason_data/obj/`)
+($_ = `rm -fr $rthome/var/mason_data/obj/`)
     or !$? or die "$_\n\nCouldn't clean mason cache";
 
 

commit d55c00c47773e17d95d3dd760cd0f6eb90e48671
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 12:37:45 2013 -0700

    The site-specific extension should also use the rt4 branch
    
    Should have been part of 784eb98.

diff --git a/bin/pull-live b/bin/pull-live
index 97d71bf..9ee1e37 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -73,7 +73,7 @@ my %REPOS = (
 
 # Quick hack, should be removed as soon as the rt4 branches are merged
 $REPOS{$_} .= " --branch rt4"
-    for grep { not (/RT-Extension-/ or $REPOS{$_} =~ /--branch/) }
+    for grep { not (/RT-Extension-(?!rt_cpan_org)/ or $REPOS{$_} =~ /--branch/) }
         keys %REPOS;
 
 my $tmp_dir = tempdir( CLEANUP => 1 )

commit f2ac72f518086d83312da001967438b5b945252c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 12:39:06 2013 -0700

    Use a descriptive temp directory name for easier manual cleanup

diff --git a/bin/pull-live b/bin/pull-live
index 9ee1e37..c3da9f6 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -76,7 +76,7 @@ $REPOS{$_} .= " --branch rt4"
     for grep { not (/RT-Extension-(?!rt_cpan_org)/ or $REPOS{$_} =~ /--branch/) }
         keys %REPOS;
 
-my $tmp_dir = tempdir( CLEANUP => 1 )
+my $tmp_dir = tempdir( "pull-live-XXXXX", TMPDIR => 1, CLEANUP => 1 )
     or die "Couldn't get temp dir";
 
 chdir $tmp_dir;

commit 09486c8c967650522a0a085d8126be3c98358f81
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 12:39:30 2013 -0700

    Cleanup the tempdir when we die too
    
    The top-level tempdir won't be cleaned up and warning will be issued if
    we're still in it.

diff --git a/bin/pull-live b/bin/pull-live
index c3da9f6..feab825 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -125,6 +125,7 @@ foreach my $path (qw(/local/plugins/RT-Extension-rt_cpan_org/html/Public/bugs-pe
 ($_ = `rm -fr $rthome/var/mason_data/obj/`)
     or !$? or die "$_\n\nCouldn't clean mason cache";
 
+END { chdir ".." }
 
 exit 0;
 

commit 2b9ad7912f42078835f6f2a3baa8344072ee57ee
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 12:42:19 2013 -0700

    Apply RT patches found in the extensions
    
    Passing --forward to patch ensures that already applied patches are
    ignored.

diff --git a/bin/pull-live b/bin/pull-live
index feab825..b341198 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -109,6 +109,12 @@ foreach my $module (@UPDATE) {
     ($_ = `cd $module && $perl ./Makefile.PL && make && sudo make install`)
         or !$? or die "$_\n\nCouldn't install module";
 
+    for my $patch (<$module/patches/*.patch>) {
+        print "Patching RT with $patch...\n";
+        ($_ = `sudo patch --forward -p1 -d $rthome < $patch`)
+            or !$? or die "$_\n\nCouldn't patch RT";
+    }
+
     rmtree($module);
     print "\n";
 }

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