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 8d60e64fdd15fff8e38135031294a28dc2ce0884 Author: Dominique Dumont <d...@debian.org> Date: Sat Apr 12 12:35:01 2014 +0200 formatting: delete trailing white spaces --- lib/Config/Model/Dpkg/Dependency.pm | 88 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm index 8fea57c..d398f61 100644 --- a/lib/Config/Model/Dpkg/Dependency.pm +++ b/lib/Config/Model/Dpkg/Dependency.pm @@ -20,8 +20,8 @@ use Parse::RecDescent ; use AnyEvent; use AnyEvent::HTTP ; -# available only in debian. Black magic snatched from -# /usr/share/doc/libapt-pkg-perl/examples/apt-version +# available only in debian. Black magic snatched from +# /usr/share/doc/libapt-pkg-perl/examples/apt-version use AptPkg::Config '$_config'; use AptPkg::System '$_system'; use AptPkg::Version; @@ -183,7 +183,7 @@ pkg_dep: pkg_name dep_version(?) arch_restriction(?) { elsif (@$dv) { push @ret, @{$dv->[0]} ;} elsif (@$ar) { push @ret, undef, undef, @{$ar->[0]} ;} $return = \@ret ; ; - } + } arch_restriction: '[' osarch(s) ']' { @@ -201,7 +201,7 @@ arch_restriction: '[' osarch(s) ']' } } -dep_version: '(' oper version ')' { $return = [ $item{oper}, $item{version} ] ;} +dep_version: '(' oper version ')' { $return = [ $item{oper}, $item{version} ] ;} pkg_name: /[a-z0-9][a-z0-9\+\-\.]+(?=\s|\Z|\(|\[)/ | /\S+/ { $add_error->("bad package name", $item[1]) ;} @@ -254,7 +254,7 @@ sub check_value { my $my_cb = sub { $self->check_dependency(@_, callback => $cb) ; } ; - + $args{fix} //= 0; $self->SUPER::check_value(%args, callback => $my_cb) ; @@ -264,14 +264,14 @@ sub check_dependency { my $self = shift; my %args = @_ ; - my ($value, $check, $silent, $notify_change, $ok, $callback,$apply_fix) + my ($value, $check, $silent, $notify_change, $ok, $callback,$apply_fix) = @args{qw/value check silent notify_change ok callback fix/} ; # value is one dependency, something like "perl ( >= 1.508 )" # or exim | mail-transport-agent or gnumach-dev [hurd-i386] # see http://www.debian.org/doc/debian-policy/ch-relationships.html - + # to get package list # wget -q -O - 'http://qa.debian.org/cgi-bin/madison.cgi?package=perl-doc&text=on' @@ -301,10 +301,10 @@ sub check_dependency { $self->check_depend_chain($apply_fix, \@dep_chain, $old ) ; $self->on_check_all_done($apply_fix,\@dep_chain,$old, sub { $callback->(%args) if $callback; }); } ; - + $async_log->debug("begin for ",$self->composite_name, " fix is $apply_fix") if $async_log->is_debug; $pending_check->begin($check_depend_chain_cb) ; - + foreach my $dep (@dep_chain) { next unless ref($dep) ; # no need to check variables $pending_check->begin ; @@ -315,7 +315,7 @@ sub check_dependency { $self->check_or_fix_pkg_name($apply_fix, $dep, $old, $cb) ; # async } - + $async_log->debug("end for ",$self->composite_name) if $async_log->is_debug; $pending_check->end; } @@ -361,11 +361,11 @@ sub check_debhelper_version { my $min_dep = Lintian::Relation->new("debhelper ( >= $compat)") ; $logger->debug("checking if ".$lintian_dep->unparse." implies ". $min_dep->unparse); - + return if $lintian_dep->implies ($min_dep) ; - + $logger->debug("'$dep_string' does not imply debhelper >= $compat"); - + # $show_rel avoids undef warnings my $show_rel = join(' ', map { $_ || ''} ($oper, $dep_v)); if ($apply_fix) { @@ -390,7 +390,7 @@ while (@deb_releases) { $deb_release_h{$k} = qr/$regexp/; } -# called in check_versioned_dep and in Parse::RecDescent grammar +# called in check_versioned_dep and in Parse::RecDescent grammar sub xxget_pkg_versions { my ($self,$cb,$pkg) = @_ ; $logger->debug("get_pkg_versions: called with $pkg"); @@ -419,7 +419,7 @@ sub struct_to_dep { if( ref ($d) and @$d) { $line .= "$d->[0]"; - # skip test for relations like << or < + # skip test for relations like << or < $skip ++ if defined $d->[1] and $d->[1] =~ /</ ; $line .= " ($d->[1] $d->[2])" if defined $d->[2]; @@ -428,13 +428,13 @@ sub struct_to_dep { } } - elsif (not ref($d) and $d) { - $line .= $d ; + elsif (not ref($d) and $d) { + $line .= $d ; } ; push @alternatives, $line if $line ; } - + my $actual_dep = @alternatives ? join (' | ',@alternatives) : undef ; return wantarray ? ($actual_dep, $skip) : $actual_dep ; @@ -446,7 +446,7 @@ sub struct_to_dep { # will modify @input (array of ref) when applying fix sub check_depend_chain { my ($self, $apply_fix, $input, $old) = @_ ; - + my ($actual_dep, $skip) = $self->struct_to_dep (@$input); my $ret = 1 ; @@ -457,7 +457,7 @@ sub check_depend_chain { $logger->debug("skipping '$actual_dep': has a < relation ship") ; return $ret ; } - + $async_log->debug("begin check alternate deps for $actual_dep") ; foreach my $depend (@$input) { if (ref ($depend)) { @@ -474,13 +474,13 @@ sub check_depend_chain { } } $async_log->debug("end check alternate deps for $actual_dep") ; - + if ($logger->is_debug and $apply_fix) { my $str = $self->struct_to_dep(@$input) ; $str //= '<undef>' ; $logger->debug("new dependency is $str"); } - + return $ret ; } @@ -511,7 +511,7 @@ sub check_perl_lib_dep { # and get_available_version. Must block and return once they are done # hence the condvar my $perl_dep_cv = AnyEvent->condvar ; - + my @ideal_perl_dep = qw/perl/ ; my @ideal_lib_dep ; my @ideal_dep_chain = (\@ideal_perl_dep); @@ -566,7 +566,7 @@ sub check_perl_lib_dep { } }; - + $on_perl_check_done = sub { my $has_older_perl = shift ; $async_log->debug("on_perl_check_done called") ; @@ -599,7 +599,7 @@ sub check_perl_lib_dep { $get_perl_versions = sub { $self->get_available_version($on_get_perl_versions, 'perl'); } ; - + $on_get_perl_versions = sub { my %perl_version = @_ ; $async_log->debug("running on_get_perl_versions for $actual_dep") ; @@ -610,7 +610,7 @@ sub check_perl_lib_dep { "older than perl in sid ($perl_version{sid})" ); - my @ordered_ideal_dep = $has_older_perl_in_sid ? + my @ordered_ideal_dep = $has_older_perl_in_sid ? ( \@ideal_perl_dep, \@ideal_lib_dep ) : ( \@ideal_lib_dep, \@ideal_perl_dep ) ; my $ideal_dep = $self->struct_to_dep( @ordered_ideal_dep ); @@ -655,12 +655,12 @@ sub check_versioned_dep { ." -> @dist_version") if $async_log->is_debug; if ( @dist_version # no older for unknow packages - and defined $oper - and $oper =~ />/ + and defined $oper + and $oper =~ />/ and $vers !~ /^\$/ # a dpkg variable ) { my $src_pkg_name = $self->grab_value("!Dpkg::Control source Source") ; - + my $filter = $test_filter || $self->grab_value( step => qq{!Dpkg my_config package-dependency-filter:"$src_pkg_name"}, mode => 'loose', @@ -684,16 +684,16 @@ sub has_older_version_than { my $regexp = $deb_release_h{$filter} ; $logger->debug("using regexp $regexp") if defined $regexp; - + my @list ; my $has_older = 0; while (@$dist_version) { my ($d,$v) = splice @$dist_version,0,2 ; - + next if defined $regexp and $d =~ $regexp ; push @list, "$d -> $v;" ; - + if ($vs->compare($vers,$v) > 0 ) { $has_older = 1 ; } @@ -719,7 +719,7 @@ sub check_or_fix_essential_package { my $cache_item = $apt_cache->get($pkg); my $is_essential = 0; $is_essential++ if (defined $cache_item and $cache_item->get('Flags') =~ /essential/i); - + if ($is_essential and not defined $oper) { $logger->debug( "found unversioned dependency on essential package: $pkg"); if ($apply_fix) { @@ -760,7 +760,7 @@ sub check_or_fix_pkg_name { $logger->info("will warn: $msg (fix++)"); } } - + # check if this package is defined in current control file if ($self->grab(step => "- - binary:$pkg", qw/mode loose autoadd 0/)) { $logger->debug("dependency $pkg provided in control file") ; @@ -842,11 +842,11 @@ my $cache_file_name = $ENV{HOME}.'/.config_model_depend_cache' ; # this condition is used during tests if (not %cache) { - tie %cache => 'DB_File', $cache_file_name, -} + tie %cache => 'DB_File', $cache_file_name, +} # required to write data back to DB_File -END { +END { untie %cache ; } @@ -1012,7 +1012,7 @@ Config::Model::Dpkg::Dependency - Checks Debian dependency declarations my $model = Config::Model->new ; $model ->create_config_class ( name => "MyClass", - element => [ + element => [ Depends => { 'type' => 'leaf', 'value_type' => 'uniline', @@ -1038,7 +1038,7 @@ Config::Model::Dpkg::Dependency - Checks Debian dependency declarations This class is derived from L<Config::Model::Value>. Its purpose is to check the value of a Debian package dependency for the following: -=over +=over =item * @@ -1052,16 +1052,16 @@ found in Debian old-stable or not. If no older version can be found, a warning will be issued. Note a warning will also be sent if the package is not found on madison and if the package is not virtual. -=item * +=item * Whether a Perl library is dual life. In this case the dependency is checked according to L<Debian Perl policy|http://pkg-perl.alioth.debian.org/policy.html#debian_control_handling>. -Because Debian auto-build systems (buildd) will use the first available alternative, +Because Debian auto-build systems (buildd) will use the first available alternative, the dependency should be in the form : -=over +=over -=item * +=item * C<< perl (>= 5.10.1) | libtest-simple-perl (>= 0.88) >> when the required perl version is available in sid. ". @@ -1085,7 +1085,7 @@ for about one month. =item * -Virtual package names are found scanning local apt cache. Hence an unknown package +Virtual package names are found scanning local apt cache. Hence an unknown package on your system may a virtual package on another system. =item * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits