Some cleanup

This commit is contained in:
Vladimir Glazunov 2010-02-23 18:52:04 +01:00
parent d9cfcd12d4
commit 3b3c6d4d90

View file

@ -68,10 +68,9 @@ sub new {
} else { } else {
$source_root = $ENV{SOURCE_ROOT_DIR}; $source_root = $ENV{SOURCE_ROOT_DIR};
}; };
$source_root = Cwd::realpath($source_root); $self->{SOURCE_ROOT} = Cwd::realpath($source_root);
$self->{DEBUG} = 0; $self->{DEBUG} = 0;
$self->{VERBOSE} = 0; $self->{VERBOSE} = 0;
$self->{SOURCE_ROOT} = $source_root if (!defined $self->{SOURCE_ROOT});
$self->{REPOSITORIES} = {}; $self->{REPOSITORIES} = {};
$self->{ACTIVATED_REPOSITORIES} = {}; $self->{ACTIVATED_REPOSITORIES} = {};
$self->{MODULE_PATHS} = {}; $self->{MODULE_PATHS} = {};
@ -89,8 +88,8 @@ sub new {
if (defined $self->{USER_SOURCE_ROOT}) { if (defined $self->{USER_SOURCE_ROOT}) {
${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT}; ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
}; };
$self->{SOURCE_CONFIG_FILE} = get_config_file($source_root); $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT});
$self->{SOURCE_CONFIG_DEFAULT} = $source_root .'/'.SOURCE_CONFIG_FILE_NAME; $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
read_config_file($self); read_config_file($self);
bless($self, $class); bless($self, $class);
return $self; return $self;