do not lose >=0 requirements!

rjbs · Mar 5, 2010 · 9f299a1 · 9f299a1
1 parent c0c875a
commit 9f299a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
+          do not lose ">= 0" requirements on merge
 
 0.100530  2010-02-22 21:09:40 America/New_York
           add is_simple method to V:R

diff --git a/lib/Version/Requirements.pm b/lib/Version/Requirements.pm
@@ -438,10 +438,6 @@ sub from_string_hash {
     my ($self, $minimum) = @_;
     $self = $self->_self;
 
-    # If $minimum is false, it's undef or 0, which cannot be meaningful as a
-    # minimum.  -- rjbs, 2010-02-20
-    return $self unless $minimum;
-
     if (defined (my $old_min = $self->{minimum})) {
       $self->{minimum} = (sort { $b cmp $a } ($minimum, $old_min))[0];
     } else {

diff --git a/t/merge.t b/t/merge.t
@@ -115,4 +115,22 @@ sub dies_ok (&@) {
   );
 }
 
+{
+  my $left = Version::Requirements->new;
+  $left->add_minimum(Foo => 0);
+  $left->add_minimum(Bar => 1);
+
+  my $right = Version::Requirements->new;
+  $right->add_requirements($left);
+
+  is_deeply(
+    $right->as_string_hash,
+    {
+      Foo => 0,
+      Bar => 1,
+    },
+    "we do not lose 0-min reqs on merge",
+  );
+}
+
 done_testing;