Skip to content

Commit 8d221ef

Browse files
committed
- no re-exports, please
1 parent 33e919c commit 8d221ef

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/backend/bs_sched

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ sub update_dst_full {
916916

917917
my $oldrepo;
918918
my %new;
919+
my $isimport;
919920

920921
if ($dst) {
921922
# get old state
@@ -937,6 +938,7 @@ sub update_dst_full {
937938
}
938939
} else {
939940
# dst = undef is true for importevents
941+
$isimport = 1;
940942
my $jobdatadir = $jobrepo->{'.dir'};
941943
delete $jobrepo->{'.dir'};
942944
my $replaced = (readxml("$jobdatadir/replaced.xml", $BSXML::dir, 1) || {})->{'entry'};
@@ -963,10 +965,10 @@ sub update_dst_full {
963965
return;
964966
}
965967

968+
my $filter;
966969
# argh, this slows us down a bit
967970
my $bconf;
968971
$bconf = getconfig($myarch, $prpsearchpath) if $prpsearchpath;
969-
my $filter;
970972
$filter = $bconf->{'exportfilter'} if $bconf;
971973
undef $filter if $filter && !%$filter;
972974
$filter ||= $default_exportfilters{$myarch};
@@ -995,6 +997,7 @@ sub update_dst_full {
995997
$myself = 1;
996998
next;
997999
}
1000+
next if $isimport; # no re-exports
9981001
push @{$exports{$exportarch}}, $rp, $r;
9991002
}
10001003
next unless $myself;
@@ -1032,7 +1035,7 @@ sub update_dst_full {
10321035
$r->{'path'} = "$prp/$myarch/:full/$n.$suf";
10331036
$repodata->{$n} = $r;
10341037
}
1035-
if ($filter) {
1038+
if ($filter && !$isimport) {
10361039
# need also to check old entries
10371040
for my $rp (sort keys %$oldrepo) {
10381041
my $r = $oldrepo->{$rp};

0 commit comments

Comments
 (0)