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

Relaxing rules WRT not requiring -version when using -defaults

parent e7f0eaa5
No related branches found
No related tags found
No related merge requests found
......@@ -85,14 +85,7 @@ sub check {
my @required_params;
if ($o->{defaults}) {
@required_params = qw/version/;
pod2usage(
-message => '-pattern is not supported with -defaults mode',
-verbose => 1,
-exitval => 1
) if $o->{pattern};
} else {
if (! $o->{defaults}) {
@required_params = qw/host username/;
pod2usage(
-message => '-pattern is not supported with -databases mode',
......@@ -152,14 +145,6 @@ sub defaults {
);
}
if(! defined $o->{password}) {
pod2usage(
-msg => 'No -password given on the command line',
-exitval => 1,
-verbose => 0
);
}
if ($o->{defaults}) {
$self->_set_opts_from_hostname();
} else {
......@@ -525,7 +510,7 @@ sub _set_opts_from_hostname {
sub _hostname_opts_from_config {
my ($self) = @_;
my $hostname_opts = {};
my $target_dir = 'release-' . $self->opts()->{version};
my $target_dir = 'release-' . ($self->opts()->{version} || q{});
my $defaults = $self->opts()->{defaults};
open my $fh, '<', $defaults or confess "Cannot open defaults file '$defaults' for reading: $!";
......
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