X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiSavedSearch.pm;h=1d13aef6728a6a5ebcbcd942a93630f61872e1ed;hb=666dde69a3f6;hp=3e10f780ad02b6dfba449024b42468198b66f571;hpb=c1cfe2c2ff17bca3cafb9dea4d7a7697eeab9683;p=public-inbox.git diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm index 3e10f780..1d13aef6 100644 --- a/lib/PublicInbox/LeiSavedSearch.pm +++ b/lib/PublicInbox/LeiSavedSearch.pm @@ -21,6 +21,7 @@ my %cquote = ("\n" => '\\n', "\t" => '\\t', "\b" => '\\b'); sub cquote_val ($) { # cf. git-config(1) my ($val) = @_; $val =~ s/([\n\t\b])/$cquote{$1}/g; + $val =~ s/\"/\\\"/g; $val; } @@ -96,7 +97,7 @@ sub translate_dedupe ($$) { my $dd = $lei->{opt}->{dedupe} // 'content'; return 1 if $dd eq 'content'; # the default return $self->{"-dedupe_$dd"} = 1 if ($dd eq 'oid' || $dd eq 'mid'); - $lei->fail("--dedupe=$dd requires --no-save"); + die("--dedupe=$dd requires --no-save\n"); } sub up { # updating existing saved search via "lei up" @@ -105,9 +106,9 @@ sub up { # updating existing saved search via "lei up" my $self = bless { ale => $lei->ale }, $cls; my $dir = $dst; output2lssdir($self, $lei, \$dir, \$f) or - return $lei->fail("--no-save was used with $dst cwd=". - $lei->rel2abs('.')); - $self->{-cfg} = $lei->cfg_dump($f) // return $lei->fail; + return die("--no-save was used with $dst cwd=". + $lei->rel2abs('.')."\n"); + $self->{-cfg} = $lei->cfg_dump($f) // return $lei->child_error; $self->{-ovf} = "$dir/over.sqlite3"; $self->{'-f'} = $f; $self->{lock_path} = "$self->{-f}.flock"; @@ -162,6 +163,10 @@ EOM my $val = $lei->{opt}->{$k} // next; print $fh "\t$k = $val\n"; } + $lei->{opt}->{stdin} and print $fh <fail("close $f: $!"); $self->{lock_path} = "$self->{-f}.flock"; $self->{-ovf} = "$dir/over.sqlite3";