[Debian-l10n-commits] r2273 - in /dl10n/trunk: Changelog lib/Debian/Pkg/DebSrc.pm

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Wed Jun  9 20:50:07 2010
New Revision: 2273

URL: http://svn.debian.org/wsvn/?sc=1&rev=2273
Log:
	* lib/Debian/Pkg/DebSrc.pm: Avoid duplicate report for files
	present in multiple archives.

Modified:
    dl10n/trunk/Changelog
    dl10n/trunk/lib/Debian/Pkg/DebSrc.pm

Modified: dl10n/trunk/Changelog
URL: http://svn.debian.org/wsvn/dl10n/trunk/Changelog?rev=2273&op=diff
==============================================================================
--- dl10n/trunk/Changelog (original)
+++ dl10n/trunk/Changelog Wed Jun  9 20:50:07 2010
@@ -1,3 +1,8 @@
+2010-06-09  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* lib/Debian/Pkg/DebSrc.pm: Avoid duplicate report for files
+	present in multiple archives.
+
 2010-06-09  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* lib/Debian/Pkg/DebSrc.pm, lib/Debian/Pkg/Tar.pm: A file can be

Modified: dl10n/trunk/lib/Debian/Pkg/DebSrc.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/Pkg/DebSrc.pm?rev=2273&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/Pkg/DebSrc.pm (original)
+++ dl10n/trunk/lib/Debian/Pkg/DebSrc.pm Wed Jun  9 20:50:07 2010
@@ -176,11 +176,19 @@
         my $expr = shift;
         my @found = ();
 
-# FIXME: There can be duplicates if the file exist in different archives
         @found = $self->SUPER::file_matches($expr);
 
-        push @found, $self->{v3}->file_matches($expr)
-                if $self->{v3};
+        if ($self->{v3}) {
+                my %found;
+                foreach (@found) {
+                        $found{$_} = 1
+                }
+                my @found2 = $self->{v3}->file_matches($expr);
+                foreach (@found2) {
+                        push @found, $_
+                                unless $found{$_};
+                }
+        }
 
         return @found;
 }