diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-07-21 17:26:17 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-07-21 17:26:17 +0200 |
| commit | c9f7f4a18b2e22346fe6f673d5bfe6738fb53870 (patch) | |
| tree | 1e04bb10e5e14efd6512462d9a5db5e4cadeb5cd /solenv | |
| parent | b6c7b932e7ad2a6d27fa62674926d1e8675ad83d (diff) | |
vgbugs10: #162096# initialisation repository considered as active
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/SourceConfig.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 84b25135cc3d..25fd13f4fdb2 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -96,6 +96,9 @@ sub new { $self->{WARNINGS} = []; $self->{REPORT_MESSAGES} = []; $self->{CONFIG_FILE_CONTENT} = []; + if (defined $self->{USER_SOURCE_ROOT}) { + ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT}; + }; $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE}); $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME; read_config_file($self); @@ -260,12 +263,8 @@ sub get_config_file { # sub get_fallback_repository { my $self = shift; - if (defined $self->{USER_SOURCE_ROOT}) { - ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT}; - } else { - my $repository_root = RepositoryHelper->new()->get_repository_root(); - ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root; - }; + my $repository_root = RepositoryHelper->new()->get_repository_root(); + ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root; }; sub read_config_file { |