Use correct value from git-repository-base.

I ported to use a key instead of a value.

In addition, properly tell whether a class method (for package Module)
is operating as an object method or as a class method.

I get a lot of errors about things not being a git module, which leads
me to believe that auto-detecting whether a module is svn or git is no
longer working, so test with care.
wilder
Michael Pyne 15 years ago
parent e3756f6d47
commit 4f1ca73485
  1. 10
      kdesrc-build

@ -586,6 +586,8 @@ our %ENV_VARS;
{
package Module;
use Scalar::Util qw(blessed);
my $ModulePhases = [qw/update build test install/];
my @ModuleList; # List of modules
@ -631,7 +633,7 @@ our %ENV_VARS;
{
my ($self, @phases) = @_;
if ($self->isa(__PACKAGE__)) {
if (blessed($self)) {
$self->{phases} = [@phases];
}
else {
@ -645,7 +647,7 @@ our %ENV_VARS;
# If already blessed, act like method, otherwise act like static
# class function.
if ($self->isa(__PACKAGE__)) {
if (blessed($self)) {
@{$self->{'phases'}} = grep($_ ne $deadPhase, @{$self->{'phases'}});
}
else {
@ -3558,6 +3560,7 @@ EOF
# List of new-ed modules to be returned, and possibly actually queued up
# for update/build.
my @moduleList;
my $selectedRepo;
# Setup default options for each module
for my $module (@modules) {
@ -3576,7 +3579,8 @@ EOF
# Fixup for the special repository handling if need be.
if (exists $optionSet{'repository'}) {
set_option($moduleName, 'repository', $optionSet{'repository'} . $module);
$selectedRepo = $repoSet->{$optionSet{'repository'}} unless $selectedRepo;
set_option($moduleName, 'repository', $selectedRepo . $module);
}
}

Loading…
Cancel
Save