Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 05, 2011
@rmtemplet Adjustment to the method to figure out the camp database type
This patch adjusts the logic so that when the config hash doesn't
already exist then it uses the camp database type.  Without this
it causes an issue with mkcamp when it doesn't have a number
argument.
493324e
@rmtemplet Give the tokenized files access to the system user
This is handy for any scripts or files that need to have the
system user adjusted at mkcamp time.
532b96f
Showing with 8 additions and 1 deletion.
  1. +8 −1 lib/Camp/Master.pm
View
9 lib/Camp/Master.pm
@@ -662,6 +662,7 @@ sub set_camp_user_info {
die "admin '$user' is unknown; aborting!\n"
unless ref($row) and $row->{admin_name}
;
+ $row->{system_user} = $user;
return $row;
}
@@ -732,7 +733,13 @@ sub _camp_db_type_dispatcher {
sub _db_type_dispatcher {
my $name = shift;
- my $type = camp_type_db_type();
+ my $type;
+ if ($conf_hash) {
+ $type = $conf_hash->{db_type};
+ }
+ else {
+ $type = camp_db_type();
+ }
my $sub = __PACKAGE__->can( "${name}_$type" );
die "No function $name for database type $type!\n" unless $sub;
return $sub;

No commit comments for this range

Something went wrong with that request. Please try again.