[kdesrc-build/make_it_mojo] /: Merge remote-tracking branch 'origin/master' into make_it_mojo

Michael Pyne null at kde.org
Wed Jul 4 19:53:26 UTC 2018


Git commit ff11a6b079eb5472a938844a6843f3998d726821 by Michael Pyne.
Committed on 02/07/2018 at 00:39.
Pushed by mpyne into branch 'make_it_mojo'.

Merge remote-tracking branch 'origin/master' into make_it_mojo

M  +1    -1    doc/index.docbook
M  +42   -39   modules/ksb/Application.pm
M  +9    -6    modules/ksb/Module.pm

https://commits.kde.org/kdesrc-build/ff11a6b079eb5472a938844a6843f3998d726821

diff --cc modules/ksb/Application.pm
index 33ebd97,84e5f8c..c991c99
--- a/modules/ksb/Application.pm
+++ b/modules/ksb/Application.pm
@@@ -360,13 -347,10 +357,14 @@@ sub generateModuleLis
      $self->_readCommandLineOptionsAndSelectors($cmdlineOptions, \@selectors,
          $ctx, @argv);
  
-     my %ignoredSelectors;
-     @ignoredSelectors{@{$cmdlineGlobalOptions->{'ignore-modules'}}} = undef;
+     # Convert list to hash for lookup
+     my %ignoredSelectors =
+         map { $_, 1 } @{$cmdlineGlobalOptions->{'ignore-modules'}};
  
 +    if (exists $cmdlineGlobalOptions->{'launch-browser'}) {
 +        _launchStatusViewerBrowser(); # does not return
 +    }
 +
      my @startProgramAndArgs = @{$cmdlineGlobalOptions->{'start-program'}};
      delete @{$cmdlineGlobalOptions}{qw/ignore-modules start-program/};
  


More information about the kde-doc-english mailing list