Changeset 1969 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Jun 13, 2015, 1:11:26 AM (9 years ago)

Author:

Bruno Cornec

Message:

When searching for amiguous distro files, do not issue error messages if
there are still other amibiguity possible but do that at the end of the
loop just once.

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -213 +213 @@
 # Ubuntu before 10.04 includes a /etc/debian_version file that creates an ambiguity with debian
 # So we need to look at distros in reverse alphabetic order to treat ubuntu always first via lsb
+my $found = 0;
 foreach $d (reverse keys %$ambiguous_rel_files) {
     $r = $ambiguous_rel_files->{$d};
@@ -219 +220 @@
         # Get all distros concerned by that file
         my $tmp=pb_get_content("$r");
-        my $found = 0;
         my $ptr = $distro_similar->{$d};
         pb_log(2,"amb: ".Dumper($ptr)."\n");
@@ -236 +236 @@
             }
         }
-        if ($found == 0) {
-            print STDERR "Unable to find $d version in $r (ambiguous)\n";
-            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
-            $release = "unknown";
-        } else {
-            return($distro,$release);
-        }
-    }
-}
-return("unknown","unknown");
+        last if ($found == 1);
+    }
+}
+if ($found == 0) {
+    print STDERR "Unable to find a version in ".join(' ',keys %$ambiguous_rel_files)." (ambiguous)\n";
+    print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
+    return("unknown","unknown");
+} else {
+    return($distro,$release);
+}
 }