Changeset 29095 for main/trunk/greenstone2/perllib/printusage.pm

Timestamp:

2014-06-12T12:17:39+12:00 (10 years ago)

Author:

kjdon

Message:

new argument to print_txt_usage. Pass 1 if you don't want the output paged. We use this when there has been an error and we are outputing the options before quitting the import/build. If the output is paged, then the die doesn't end up getting through to the top level program. So for full-rebuild, if the import died because of a parsing error, if the output had been paged, then the import was stopped but the system return value was 0, and then it would go on to the next stage, trying to build. So now, if we are stopping because of an error, then don't page the output.

File:

• main/trunk/greenstone2/perllib/printusage.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/printusage.pm

@@ -172 +172 @@
     my $options = shift(@_);
     my $params = shift(@_);
-
+    my $no_pager = shift(@_);
+
+    unless ($no_pager) {
     # this causes us to automatically send output to a pager, if one is
     # set, AND our output is going to a terminal
@@ -189 +191 @@
     open(STDERR,">&STDOUT"); # so it's easier to pipe output
     }
-
+    }