Skip to content

Commit

Permalink
[backend] package info: don't bother craeting a bconf if nofilename i…
Browse files Browse the repository at this point in the history
…s used
  • Loading branch information
mlschroe committed Sep 12, 2013
1 parent d8edd80 commit adc47ce
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/backend/bs_srcserver
Expand Up @@ -7472,17 +7472,19 @@ sub getprojectsourceinfo {

sub getpackagesourceinfo {
my ($cgi, $projid, $packid) = @_;
my $bconf;
checkprojrepoarch($projid, $cgi->{'repository'}, $cgi->{'arch'});
if (!$cgi->{'repository'}) {
my $bconf;
if (!$cgi->{'nofilename'}) {
my $cfile;
$cfile = "$projectsdir/$projid.conf" if -e "$projectsdir/$projid.conf";
if (!$cgi->{'repository'}) {
$cfile = "$projectsdir/$projid.conf" if -e "$projectsdir/$projid.conf";
} else {
print "expandsearchpath $projid $cgi->{'repository'}...\n";
my @path = expandsearchpath($projid, $cgi->{'repository'});
my $c = concatconfigs($projid, $cgi->{'repository'}, undef, @path);
$cfile = [ split("\n", $c) ];
}
$bconf = Build::read_config($cgi->{'arch'} || 'noarch', $cfile);
} else {
print "expandsearchpath $projid $cgi->{'repository'}...\n";
my @path = expandsearchpath($projid, $cgi->{'repository'});
my $c = concatconfigs($projid, $cgi->{'repository'}, undef, @path);
$bconf = Build::read_config($cgi->{'arch'} || 'noarch', [ split("\n", $c) ]);
}
my $res = sourceinfo($cgi, $projid, $packid, $bconf);
return ($res, $BSXML::sourceinfo);
Expand Down

0 comments on commit adc47ce

Please sign in to comment.