From bae1fcc23e512c1be5e0d6b1f7608d824919cb62 Mon Sep 17 00:00:00 2001
From: "y0169.zhang" <y0169.zhang@samsung.com>
Date: Fri, 4 Aug 2017 10:14:14 +0800
Subject: [PATCH] Fix build error with --baselibs option

Change-Id: Iad6097925cf844900260aec1680f88638dff2209
---
 depanneur | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/depanneur b/depanneur
index d1ae096..245bd62 100755
--- a/depanneur
+++ b/depanneur
@@ -1804,14 +1804,15 @@ sub update_repo_with_rpms {
     # $2: list of package full path
     my ($ref_hash, @pkgs) = @_;
     foreach my $pkg (@pkgs) {
-        my ($name, $version, $release) = get_pkg_info $pkg;
+        my ($name, $version, $release, $arch) = get_pkg_info $pkg;
         next if $name eq '';
-        if (exists $ref_hash->{$name}) {
-            foreach (@{$ref_hash->{$name}}) {
+        my $na = "$name$arch";
+        if (exists $ref_hash->{$na}) {
+            foreach (@{$ref_hash->{$na}}) {
                 my_system("rm -rf $_");
             }
         }
-        $ref_hash->{$name} = [$pkg];
+        $ref_hash->{$na} = [$pkg];
     }
 }
 
@@ -2558,12 +2559,13 @@ for(my $i = 0; $i < $MAX_THREADS; $i++) {
 
 # scan local repo
 for my $pkg (bsd_glob "$rpm_repo_path/*.rpm") {
-    my ($name, $version, $release) = get_pkg_info $pkg;
+    my ($name, $version, $release, $arch) = get_pkg_info $pkg;
     next if $name eq '';
-    if (exists $rpmpaths{$name}) {
-        push @{$rpmpaths{$name}}, $pkg;
+    my $na = "$name$arch";
+    if (exists $rpmpaths{$na}) {
+        push @{$rpmpaths{$na}}, $pkg;
     } else {
-        $rpmpaths{$name} = [$pkg];
+        $rpmpaths{$na} = [$pkg];
     }
 }
 for my $pkg (bsd_glob "$srpm_repo_path/*.rpm") {
-- 
2.34.1