From: Rob H. <for...@us...> - 2002-11-06 05:17:26
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv32663/lib/SandWeb Modified Files: Config.pm Log Message: we should allow null values, some attributes don't need to exist if they are not being used ( like remember_repo_password ) Index: Config.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v retrieving revision 1.31 retrieving revision 1.32 diff -U2 -r1.31 -r1.32 --- Config.pm 7 Oct 2002 18:35:52 -0000 1.31 +++ Config.pm 6 Nov 2002 05:17:22 -0000 1.32 @@ -182,4 +182,5 @@ my $server = $args{'server'} || ''; my $username = $args{'username'} || ''; + my $remember_repo_password = $args{'remember_repo_password'} || ''; my $password = $args{'password'} || ''; my $connection = $args{'connection'} || ''; @@ -194,4 +195,5 @@ $self->{'repo'}->{$name}->{'server'} = $server; $self->{'repo'}->{$name}->{'username'} = $username; + $self->{'repo'}->{$name}->{'remember_repo_password'} = $remember_repo_password; $self->{'repo'}->{$name}->{'password'} = $password; $self->{'repo'}->{$name}->{'connection'} = $connection; @@ -209,5 +211,5 @@ my $username = $args{'username'} || ''; my $password = $args{'password'} || ''; - my $remember_password = $args{'remember_password'} || ''; + my $remember_repo_password = $args{'remember_repo_password'} || ''; my $connection = $args{'connection'} || ''; my $type = $args{'type'} || ''; @@ -216,11 +218,11 @@ if ($self->repository_exists(repo => $name)) { $self->{'repo'}->{$name}->{'name'} = $name; - $self->{'repo'}->{$name}->{'server'} = $server if ($server); - $self->{'repo'}->{$name}->{'username'} = $username if ($username); - $self->{'repo'}->{$name}->{'password'} = $password if ($password); - $self->{'repo'}->{$name}->{'remember_password'} = $remember_password if ($remember_password); - $self->{'repo'}->{$name}->{'connection'} = $connection if ($connection); - $self->{'repo'}->{$name}->{'type'} = $type if ($type); - $self->{'repo'}->{$name}->{'root'} = $root if ($root); + $self->{'repo'}->{$name}->{'server'} = $server; + $self->{'repo'}->{$name}->{'username'} = $username; + $self->{'repo'}->{$name}->{'password'} = $password; + $self->{'repo'}->{$name}->{'remember_repo_password'} = $remember_repo_password; + $self->{'repo'}->{$name}->{'connection'} = $connection; + $self->{'repo'}->{$name}->{'type'} = $type; + $self->{'repo'}->{$name}->{'root'} = $root; } else { return 0; @@ -311,5 +313,5 @@ my $repo_name = $args{'repo'}; if ($self->repository_exists(repo => $repo_name)) { - return $self->{'repo'}->{$repo_name}->{'remember_password'} || '' + return $self->{'repo'}->{$repo_name}->{'remember_repo_password'} || '' } else { return ''; @@ -322,5 +324,5 @@ my $repo_server = $args{'value'}; if ($self->repository_exists(repo => $repo_name)) { - $self->{'repo'}->{$repo_name}->{'remember_password'} = $value || ''; + $self->{'repo'}->{$repo_name}->{'remember_repo_password'} = $value || ''; return 1; } else { |