Skip to content
Snippets Groups Projects
Commit e3233965 authored by Andy Yates's avatar Andy Yates
Browse files

Checksums should be the other way around. It's checksum then file not file then checksum

parent e2e40b26
No related branches found
No related tags found
No related merge requests found
...@@ -348,7 +348,7 @@ sub checksum { ...@@ -348,7 +348,7 @@ sub checksum {
my $path = File::Spec->catfile($dir, $file); my $path = File::Spec->catfile($dir, $file);
my $sum = `sum $path`; my $sum = `sum $path`;
$sum =~ s/\s* $path//xms; $sum =~ s/\s* $path//xms;
print $fh $file, "\t", $sum; print $fh "${sum}\t${file}";
} }
$fh->close(); $fh->close();
$self->permissions($checksum); $self->permissions($checksum);
...@@ -505,7 +505,11 @@ sub _set_opts_from_hostname { ...@@ -505,7 +505,11 @@ sub _set_opts_from_hostname {
$o->{port} = $settings->{port}; $o->{port} = $settings->{port};
if (!$o->{databases}) { if (!$o->{databases}) {
$o->{databases} = $self->_all_dbs($settings->{pattern}); my $opts_pattern = $o->{pattern};
$opts_pattern = qr/$opts_pattern/ if $opts_pattern;
my $settings_pattern = $settings->{pattern};
my $pattern = (defined $opts_pattern) ? $opts_pattern : $settings_pattern;
$o->{databases} = $self->_all_dbs($pattern);
} }
#Set default dir #Set default dir
...@@ -656,8 +660,7 @@ REQUIRED. Password of the connecting user. ...@@ -656,8 +660,7 @@ REQUIRED. Password of the connecting user.
Uses the default mechanism which involves looking at the host the script Uses the default mechanism which involves looking at the host the script
is executing on and setting a number of options for databases to look for is executing on and setting a number of options for databases to look for
as well as port settings. C<-defaults> can be used in conjunction with as well as port settings. C<-defaults> can be used in conjunction with
C<-groups>, C<-species> and C<-tables> but not with parameters like <--host> C<-groups>, C<-species> and C<-tables> but not with parameters like <--host>.
and C<--pattern>.
The options set are specified by your custom ini-file. The options set are specified by your custom ini-file.
...@@ -680,8 +683,7 @@ with <--defaults>. ...@@ -680,8 +683,7 @@ with <--defaults>.
=item B<--pattern> =item B<--pattern>
Allows the specification of a regular expression to select databases with. Allows the specification of a regular expression to select databases with.
Cannot be used in conjunction with the C<--databases> argument. Cannot be used Cannot be used in conjunction with the C<--databases> argument.
with <--defaults>.
=item B<--databases> =item B<--databases>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment