From 4985e2dbe71514bbbd2333c96d692e9c8b68d852 Mon Sep 17 00:00:00 2001 From: "yang.zhang" Date: Thu, 26 May 2016 10:12:00 +0800 Subject: [PATCH] Solve gbs local full build problem Change-Id: Id7bd20082ab0016fea7cb31ec47e5bc2e964847f --- Build/Rpmmd.pm | 2 +- createdirdeps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/Rpmmd.pm b/Build/Rpmmd.pm index de5cfb6..fa81b00 100644 --- a/Build/Rpmmd.pm +++ b/Build/Rpmmd.pm @@ -169,7 +169,7 @@ sub primary_handle_dep { return if $dep =~ /^rpmlib\(/; if(exists $attr{'flags'}) { my $evr = $attr{'ver'}; - return unless defined($evr) && exists($flagmap{$attr{'flags'}}); + #return unless defined($evr) && exists($flagmap{$attr{'flags'}}); $evr = "$attr{'epoch'}:$evr" if $attr{'epoch'}; $evr .= "-$attr{'rel'}" if defined $attr{'rel'}; $dep .= " $flagmap{$attr{'flags'}} $evr"; diff --git a/createdirdeps b/createdirdeps index e507004..280e4f5 100755 --- a/createdirdeps +++ b/createdirdeps @@ -85,7 +85,7 @@ for my $dir (@ARGV) { } } } - my $q = Build::query($path, 'addselfprovides' => 1, 'conflicts' => 1, 'evra' => 1, 'buildtime' => 1); + my $q = Build::query($path, 'addselfprovides' => 1, 'conflicts' => 1, 'evra' => 1, 'buildtime' => 1, 'alldeps' => 1); next unless $q && defined($q->{'name'}) && defined($q->{'arch'}) && defined($q->{'version'}); my $idx = "$q->{'name'}.$q->{'arch'}-$id"; next if $seen{$idx}; -- 2.34.1