summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiankang.fan <jiankang.fan@samsung.com>2016-03-10 16:54:14 +0800
committerjiankang.fan <jiankang.fan@samsung.com>2016-03-10 16:54:14 +0800
commit10b022328986349dd003f678911da96b302559a8 (patch)
tree428c7dd6e1227ff7c5f29cddcdba89988c77f123
parentc6bda496cd3b160cff173d1c4dd1a6e68b8b75c0 (diff)
downloadbuild-10b022328986349dd003f678911da96b302559a8.tar.gz
build-10b022328986349dd003f678911da96b302559a8.tar.bz2
build-10b022328986349dd003f678911da96b302559a8.zip
Fix merge patch error for(Support ExportFilter)
Change-Id: Ic0e13850b901c0b11b5403b53e9e7cec8096ab53 Signed-off-by: jiankang.fan <jiankang.fan@samsung.com>
-rwxr-xr-xexpanddeps5
1 files changed, 5 insertions, 0 deletions
diff --git a/expanddeps b/expanddeps
index 05de077..c7520bd 100755
--- a/expanddeps
+++ b/expanddeps
@@ -176,6 +176,11 @@ while(<F>) {
if (/^F:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
my $pkgname = basename($2);
$pkgF = $2;
+ next if $fn{$1};
+ $fn{$1} = $2;
+ my $pack = $1;
+ $pack =~ /^(.*)\.([^\.]+)$/ or die;
+ push @{$packs_arch{$2}}, $1;
my $basename = $1;
my $arch = $2;
for(keys %exportfilters) {