[libconfig-model-dpkg-perl] 05/13: Dependency: cleanup the code used to compute the ideal dependency

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit 0ea39274e6d797f467dac2cd962b8dae500dc761
Author: Dominique Dumont <dod at debian.org>
Date:   Wed May 20 13:39:03 2015 +0200

    Dependency: cleanup the code used to compute the ideal dependency
---
 lib/Config/Model/Dpkg/Dependency.pm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index 1d21944..5156a57 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -541,16 +541,11 @@ sub check_perl_lib_dep {
 	my ($has_older_perl) = $self->check_versioned_dep(  ['perl', '>=', $v_normal] );
 	push @ideal_perl_dep, '>=', $v_normal if $has_older_perl;
 
-	if ( defined $dep_v ) {
-		my ($has_older_lib) = $self->check_versioned_dep(  $depend );
-		if ($has_older_perl) {
-			push @ideal_lib_dep, $dep_name;
-			push @ideal_lib_dep, '>=', $dep_v if $has_older_lib;
-		}
-	}
-	elsif ($has_older_perl or $removed or $deprecated) {
-		push @ideal_lib_dep, $dep_name;
-	}
+    if ($removed or $deprecated or $has_older_perl) {
+        my ($has_older_lib) = $self->check_versioned_dep(  $depend );
+        push @ideal_lib_dep, $dep_name;
+        push @ideal_lib_dep, '>=', $dep_v if $dep_v and $has_older_lib;
+    }
 
 	my %perl_version =  $self->get_available_version( 'perl');
 	my $has_older_perl_in_sid = ( $vs->compare( $v_normal, $perl_version{sid} ) < 0 ) ? 1 : 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git