[libconfig-model-dpkg-perl] 04/07: dependency: refactor code

dod at debian.org dod at debian.org
Mon Aug 21 17:54:31 UTC 2017


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 c89a93257b4ca5856501d490f0d78025b0cd1049
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Aug 18 19:42:31 2017 +0200

    dependency: refactor code
---
 lib/Config/Model/Dpkg/Dependency.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index b3c2726..f21115e 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -775,16 +775,19 @@ sub check_or_fix_dep {
     $logger->debug("called with '", scalar $self->struct_to_dep($dep_info), "' and fix $apply_fix")
         if $logger->is_debug;
 
-    if(not defined $pkg) {
+    if (not defined $pkg) {
         # pkg may be cleaned up during fix
+        return;
     }
-    elsif ( $pkg eq 'debhelper' ) {
-        $self->check_debhelper_version( $apply_fix, $dep_info, $msgs );
-    }
-    else {
-		my ( $vers_dep_ok, @list ) =  $self->check_versioned_dep( $dep_info );
-		$self->warn_or_remove_vers_dep ($apply_fix, $dep_info, \@list, $msgs) unless $vers_dep_ok ;
+
+    if ( $pkg eq 'debhelper' ) {
+        return $self->check_debhelper_version( $apply_fix, $dep_info, $msgs );
     }
+
+    my ( $vers_dep_ok, @list ) =  $self->check_versioned_dep( $dep_info );
+    return if $vers_dep_ok;
+
+    $self->warn_or_remove_vers_dep ($apply_fix, $dep_info, \@list, $msgs) ;
 }
 
 sub warn_or_remove_vers_dep {

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



More information about the Pkg-perl-cvs-commits mailing list