From 49666a84e76e9c67af0ca22074ea0607efb7d640 Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Mon, 21 Jan 2013 14:13:35 -0500 Subject: [PATCH] kde-projects: Don't filter out kde-build-metadata. Specifically, when we have a non-master global branch, the new feature to filter out module-set modules that don't have that branch was being mis-applied to kde-build-metadata just to get some flags set right. Instead, set the flags needed directly and skip the filter. --- kdesrc-build | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kdesrc-build b/kdesrc-build index 0b5d6cc..73d3296 100755 --- a/kdesrc-build +++ b/kdesrc-build @@ -924,17 +924,18 @@ sub expandXMLModules } elsif ($repositoryMetadataRequired) { my $repoMetadataModule = ksb::Module->new($ctx, 'kde-build-metadata'); - $repoMetadataModule->setScmType('metadata'); - - # Manually run this through the filter so all the right magic happens. - ($repoMetadataModule) = &$filter($repoMetadataModule); - # Ensure we only ever try to update source, not build. - $repoMetadataModule->phases()->phases('update'); + # Hardcode the results instead of expanding out the project info + $repoMetadataModule->setOption('repository', 'kde:kde-build-metadata'); + $repoMetadataModule->setOption('#xml-full-path', 'kde-build-metadata'); + $repoMetadataModule->setOption('#branch:stable', 'master'); $repoMetadataModule->setScmType('metadata'); $repoMetadataModule->setOption('disable-snapshots', 1); $repoMetadataModule->setOption('branch', 'master'); + # Ensure we only ever try to update source, not build. + $repoMetadataModule->phases()->phases('update'); + unshift @results, $repoMetadataModule; }