diff --git a/modules/ksb/KDEXMLReader.pm b/modules/ksb/KDEXMLReader.pm index 9a26b94..e7493f6 100644 --- a/modules/ksb/KDEXMLReader.pm +++ b/modules/ksb/KDEXMLReader.pm @@ -99,16 +99,8 @@ sub _readYAML 'repo' => $repoPath, 'name' => $repoName, 'active' => !!$proj_data->{repoactive}, - # Hardcoded from common/urls_gitrepo.json - # 'tarball' => "https://anongit.kde.org/$repoName/$repoName-latest.tar.gz", - 'tarball' => '', - - # Branch data was entered into XML by reading git repo directly, so we must - # wait for git repo to be loaded or use dependency data/logical module groups - # 'branch' => '', - # 'branches' => [ ], - # 'branchtype' => '', # Either branch:stable or branch:trunk - }; # Repo/Active/tarball to be added by char handler. + 'found_by' => 'direct', # can be changed in getModulesForProject + }; $self->{repositories}->{$repoName} = $curRepository; } @@ -124,11 +116,17 @@ sub getModulesForProject my $repositoryRef = $self->{repositories}; my @results; my $findResults = sub { - push @results, ( + my @matchList = grep { _projectPathMatchesWildcardSearch( $repositoryRef->{$_}->{'fullName'}, $proj) - } (keys %{$repositoryRef})); + } (keys %{$repositoryRef}); + + if ($proj =~ m/\*/) { + $repositoryRef->{$_}->{found_by} = 'wildcard' foreach @matchList; + } + + push @results, @matchList; }; # Wildcard matches happen as specified if asked for. diff --git a/modules/ksb/ModuleSet/KDEProjects.pm b/modules/ksb/ModuleSet/KDEProjects.pm index 1add6c4..5e3ddc3 100644 --- a/modules/ksb/ModuleSet/KDEProjects.pm +++ b/modules/ksb/ModuleSet/KDEProjects.pm @@ -176,12 +176,10 @@ sub _expandModuleCandidates $self->_initializeNewModule($newModule); $newModule->setOption('repository', $repo); $newModule->setOption('#xml-full-path', $result->{'fullName'}); - $newModule->setOption('#branch:stable', $result->{'branch:stable'}); + $newModule->setOption('#branch:stable', undef); + $newModule->setOption('#found-by', $result->{found_by}); $newModule->setScmType('proj'); - my $tarball = $result->{'tarball'}; - $newModule->setOption('#snapshot-tarball', $tarball) if $tarball; - if (none_true( map { ksb::KDEXMLReader::_projectPathMatchesWildcardSearch(