[Bps-public-commit] r9929 - in bpsbuilder/BPB: . lib/BPB/Script

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Dec 13 09:19:42 2007
New Revision: 9929

Modified:
   bpsbuilder/BPB/   (props changed)
   bpsbuilder/BPB/lib/BPB/Backend/SVK.pm
   bpsbuilder/BPB/lib/BPB/Script/Import.pm

Log:
 r25557 at sun-navys-macbook:  sunnavy | 2007-12-13 16:57:56 +0800
 merge deps and main dirs to dists


Modified: bpsbuilder/BPB/lib/BPB/Backend/SVK.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Backend/SVK.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Backend/SVK.pm	Thu Dec 13 09:19:42 2007
@@ -31,7 +31,7 @@
 sub initialize {
     my $self = shift;
     my $dir = tempdir( CLEANUP => 1 );
-    for (qw/bpb main deps/) {
+    for (qw/bpb dists/) {
         mkdir File::Spec->catfile( $dir, $_ );
     }
     open my $order,   '>', File::Spec->catfile( $dir, 'bpb', 'order.yml' );
@@ -49,7 +49,7 @@
     my %args = @_;
     my $cmd  = $self->_cmd( import => %args );
     $self->_run($cmd);
-    $self->_update_order( source => $args{source} ) if $args{_deps};
+    $self->_update_order( source => $args{source} );
 }
 
 =head2 export
@@ -107,16 +107,12 @@
         if ( $args{_initialize} ) {
             $cmd = join ' ', 'svk', 'import', $args{source}, $self->repository;
         }
-        elsif ( $args{_deps} ) {
+        else {
             my $name = $args{source};
             $name =~ s!^.*/(.+)/?$!$1.tar.gz!;
             $name = CPAN::DistnameInfo->new($name)->dist;
             $cmd = join ' ', 'svk', 'import', $args{source},
-              $self->repository . "/deps/$name";
-        }
-        else {
-            $cmd = join ' ', 'svk', 'import', $args{source},
-              $self->repository . '/main';
+              $self->repository . "/dists/$name";
         }
     }
     elsif ( $type eq 'commit' ) {

Modified: bpsbuilder/BPB/lib/BPB/Script/Import.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Script/Import.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Script/Import.pm	Thu Dec 13 09:19:42 2007
@@ -20,6 +20,8 @@
     );
 }
 
+my %imported;
+
 sub run {
     my $self   = shift;
     my $source = shift;
@@ -37,7 +39,6 @@
     $bpb->backend->import( map { $_, $self->$_ } qw/comment source/ );
 }
 
-my %imported;
 
 sub import_req {
     my $self         = shift;
@@ -75,7 +76,6 @@
                 $self->import_req( $s, $bpb );
 
                 $bpb->backend->import(
-                    _deps   => 1,
                     comment => 'deps for ' . $source,
                     source  => $s,
                 );