diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-10-30 18:16:50 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-10-30 18:16:50 +0100 |
| commit | 841c23eeaf80d9efbe23b48e03296b0a201c956a (patch) | |
| tree | 65392a942c84cef784b34b0676cf30e14d043449 /solenv/bin/deliver.pl | |
| parent | ause103: update to DEV300 m62 (diff) | |
| parent | Create DEV300_m63 milestone tag from trunk@277194 (diff) | |
| download | core-841c23eeaf80d9efbe23b48e03296b0a201c956a.tar.gz core-841c23eeaf80d9efbe23b48e03296b0a201c956a.zip | |
ause103: update to DEV300 m63
Diffstat (limited to 'solenv/bin/deliver.pl')
| -rwxr-xr-x | solenv/bin/deliver.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 055d97dbcb3e..9db619fe7902 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -400,8 +400,6 @@ sub parse_options { my $arg; my $dontdeletecommon = 0; - $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'); - $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE'); while ( $arg = shift @ARGV ) { $arg =~ /^-force$/ and $opt_force = 1 and next; $arg =~ /^-minor$/ and $opt_minor = 1 and next; @@ -422,13 +420,15 @@ sub parse_options } $dest = $arg; } + $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE')) && ( ! $opt_verbose ); + $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE') && ( ! $opt_silent ); # $dest and $opt_zip or $opt_delete are mutually exclusive if ( $dest and ($opt_zip || $opt_delete) ) { usage(1); } # $opt_silent and $opt_check or $opt_verbose are mutually exclusive if ( ($opt_check or $opt_verbose) and $opt_silent ) { - print STDERR "Error on command line: options '-check' and '-quiet' are mutually exclusive.\n"; + print STDERR "Error on command line: options '-check'/'-verbose' and '-quiet' are mutually exclusive.\n"; usage(1); } if ($dontdeletecommon) { |