Use >= as the default atom range

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 0003b36992ae0dff913006b9419cf720fdae86cb..051378af22226fcda52b862b53782350bb7cc7e8 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -565,11 +565,10 @@ sub ebuild_source {
   push @requires, $atom;
  }
 
   push @requires, $atom;
  }
 

- my $min_perl = $stat->min_perl;

  my $perl = CPANPLUS::Dist::Gentoo::Atom->new(
   category => 'dev-lang',
   name     => 'perl',
  my $perl = CPANPLUS::Dist::Gentoo::Atom->new(
   category => 'dev-lang',
   name     => 'perl',

-  (defined $min_perl ? (version => $min_perl, range => '>=') : ()),
+  version  => $stat->min_perl,

  );
 
  @requires = CPANPLUS::Dist::Gentoo::Atom->fold($perl, @requires);
  );
 
  @requires = CPANPLUS::Dist::Gentoo::Atom->fold($perl, @requires);


@@ -619,7 +618,7 @@ sub _cpan2portage {
    return CPANPLUS::Dist::Gentoo::Atom->new(
     category => $last->category,
     name     => $last->name,
    return CPANPLUS::Dist::Gentoo::Atom->new(
     category => $last->category,
     name     => $last->name,

-    (defined $version ? (version => $version, range => '>=') : ()),
+    version  => $version,

     ebuild   => $last->ebuild,
    );
   }
     ebuild   => $last->ebuild,
    );
   }

diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
index 565178ec501f50babd77131fa8bd1f072a2311c8..bbb6d882ff6df607c05fb28b4d1e04ad11bd11cf 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm
+++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
@@ -74,7 +74,7 @@ sub new {
    Carp::confess("Invalid range $range")
                                       unless grep $range eq $_, qw|< <= = >= >|;
   } else {
    Carp::confess("Invalid range $range")
                                       unless grep $range eq $_, qw|< <= = >= >|;
   } else {

-   $range = '=';
+   $range = '>=';

   }
  } else {
   Carp::confess('Range atoms require a valid version')
   }
  } else {
   Carp::confess('Range atoms require a valid version')

diff --git a/t/30-atom-new.t b/t/30-atom-new.t
index c4dcdbe9282cc2bfbfd37d0ee2d8f86933ca1d73..b44f9375d9559790f62678933c19ae9e9b0abdcc 100644 (file)
--- a/t/30-atom-new.t
+++ b/t/30-atom-new.t
@@ -22,18 +22,18 @@ my @tests = (
  [ { category => 'test' }  => $no_info ],
  [ $a0                     => $a0 ],
  [ { %$a0, range => '<=' } => $range_no_ver ],
  [ { category => 'test' }  => $no_info ],
  [ $a0                     => $a0 ],
  [ { %$a0, range => '<=' } => $range_no_ver ],

- [ $a1                     => { %$a1, range => '=' } ],
+ [ $a1                     => { %$a1, range => '>=' } ],

  [ { %$a1, range => '<=' } => { %$a1, range => '<=' } ],
 
  [ { atom => 'test/a' }        => $a0 ],
  [ { %$a1, range => '<=' } => { %$a1, range => '<=' } ],
 
  [ { atom => 'test/a' }        => $a0 ],

- [ { atom => 'test/a-1.0' }    => { %$a1, range => '=' } ],
- [ { atom => '>=test/a-v1.0' } => { %$a1, range => '>=' } ],
+ [ { atom => 'test/a-1.0' }    => { %$a1, range => '>=' } ],
+ [ { atom => '=test/a-v1.0' }  => { %$a1, range => '=' } ],

  [ { atom => '=<test/a-v1.0' } => $inv_atom ],
  [ { atom => '>=test/a' }      => $range_no_ver ],
 
  [ { ebuild => undef }                      => $inv_ebuild ],
  [ { ebuild => '/wat/test/a/a.ebuild' }     => $inv_ebuild ],
  [ { atom => '=<test/a-v1.0' } => $inv_atom ],
  [ { atom => '>=test/a' }      => $range_no_ver ],
 
  [ { ebuild => undef }                      => $inv_ebuild ],
  [ { ebuild => '/wat/test/a/a.ebuild' }     => $inv_ebuild ],

- [ { ebuild => '/wat/test/a/a-1.0.ebuild' } => { %$a1, range => '=' } ],
+ [ { ebuild => '/wat/test/a/a-1.0.ebuild' } => { %$a1, range => '>=' } ],

  [ { ebuild => '/wat/test/a/b-1.0.ebuild' } => $inv_ebuild ],
 );
 
  [ { ebuild => '/wat/test/a/b-1.0.ebuild' } => $inv_ebuild ],
 );