[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.6-134-g190505a



The following commit has been merged in the master branch:
commit 190505a7b6445bd4e11970462a8e4e82ada7d63b
Author: Niels Thykier <niels@thykier.net>
Date:   Sun May 13 20:21:05 2012 +0200

    c/fields: Remove some redundant variables
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index 39d9b3e..da3561c 100644
--- a/checks/fields
+++ b/checks/fields
@@ -535,7 +535,6 @@ if ($type eq 'binary') {
     $metapackage = 1 if $KNOWN_METAPACKAGES->known($pkg);
 }
 if (($type eq 'binary') || ($type eq 'udeb')) {
-    my (%fields, %parsed);
     my $javalib = 0;
     my $replaces = $info->relation('replaces');
     my %nag_once = ();
@@ -546,7 +545,6 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
         my $data = $info->field($field);
         my $javadep = 0;
         unfold($field, \$data);
-        $fields{$field} = $data;
 
         my (@seen_libstdcs, @seen_tcls, @seen_tclxs, @seen_tks, @seen_tkxs, @seen_libpngs);
 
@@ -715,11 +713,11 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
     # If Conflicts or Breaks is set, make sure it's not inconsistent with
     # the other dependency fields.
     for my $conflict (qw/conflicts breaks/) {
-        next unless $fields{$conflict};
+        next unless $info->field ($conflict);
         for my $field (qw(depends pre-depends recommends suggests)) {
             next unless $info->field($field);
             my $relation = $info->relation($field);
-            for my $package (split /\s*,\s*/, $fields{$conflict}) {
+            for my $package (split /\s*,\s*/, $info->field ($conflict)) {
                 tag 'conflicts-with-dependency', $field, $package
                     if $relation->implies($package);
             }
@@ -840,7 +838,6 @@ if ($type eq 'source') {
     }
 
     # Make sure build dependencies and conflicts are consistent.
-    my %parsed;
     for ($depend{'build-conflicts'}, $depend{'build-conflicts-indep'}) {
         next unless $_;
         for my $conflict (split /\s*,\s*/, $_) {

-- 
Debian package checker


Reply to: