summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-06-12 17:09:57 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-06-12 17:09:57 (GMT)
commitc01715d49064110d9ed7236d1f02ed2a0418cfdc (patch) (side-by-side diff)
treee298e5cb417b5fb83f277dc8d77e70e040d7c477
parent85563afeac954a50de7e4c207f43b57a4e63e474 (diff)
downloadpies-c01715d49064110d9ed7236d1f02ed2a0418cfdc.tar.gz
pies-c01715d49064110d9ed7236d1f02ed2a0418cfdc.tar.bz2
Version 1.3.92
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS6
-rw-r--r--configure.ac2
-rw-r--r--lib/urlconn.c3
-rw-r--r--lib/wildmatch.c1
-rw-r--r--po/POTFILES.in3
-rw-r--r--src/cmdline.opt2
-rw-r--r--src/pies.c8
-rw-r--r--src/piesctl.c2
-rw-r--r--src/progman.c2
-rw-r--r--tests/testsuite.at2
10 files changed, 19 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index f5be6dd..f4afcd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
-GNU Pies NEWS -- history of user-visible changes. 2019-06-07
+GNU Pies NEWS -- history of user-visible changes. 2019-06-12
See the end of file for copying conditions.
Please send Pies bug reports to <bug-pies@gnu.org> or
<bug-pies@gnu.org.ua>
-Version 1.3.91 (git)
+Version 1.3.92 (git)
* New option --no-init
@@ -93,6 +93,8 @@ Programs started via "exec" statement in the "return-code" block
obtain the PID of the master pies process in environment variable
PIES_MASTER_PID.
+* Improved testsuite
+
Version 1.3, 2016-10-01
diff --git a/configure.ac b/configure.ac
index 814ac00..ae3a9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# along with GNU Pies. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.63])
-AC_INIT([GNU Pies], [1.3.91], [bug-pies@gnu.org.ua])
+AC_INIT([GNU Pies], [1.3.92], [bug-pies@gnu.org.ua])
AC_CONFIG_SRCDIR([src/pies.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
diff --git a/lib/urlconn.c b/lib/urlconn.c
index 5994626..acf42d0 100644
--- a/lib/urlconn.c
+++ b/lib/urlconn.c
@@ -104,7 +104,8 @@ url_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
case EAI_BADFLAGS:
case EAI_SOCKTYPE:
- grecs_error (NULL, 0, _("%s:%d: internal error converting address"),
+ grecs_error (NULL, 0,
+ _("%s:%d: internal error while converting network address"),
__FILE__,__LINE__);
return -1;
diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index 2b4d7c8..cf359bd 100644
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -18,6 +18,7 @@
# include <config.h>
#endif
#include <stdlib.h>
+#include <wordsplit.h>
enum
{
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 764dd28..307e775 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,12 +37,15 @@ src/piesctl-cl.h
lib/grecsasrt.c
lib/netrc.c
lib/pp.c
+lib/urlconn.c
+grecs/src/assert.c
grecs/src/cidr.c
grecs/src/format.c
grecs/src/grecs-gram.y
grecs/src/grecs-lex.l
grecs/src/json-gram.y
+grecs/src/lineacc.c
grecs/src/meta1-gram.y
grecs/src/meta1-lex.l
grecs/src/opthelp.c
diff --git a/src/cmdline.opt b/src/cmdline.opt
index ff560be..d2aaf6d 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -37,7 +37,7 @@ BEGIN
END
OPTION(,E,,
- [<preprocess config and exit>])
+ [<preprocess configuration file and exit>])
BEGIN
preprocess_only = 1;
END
diff --git a/src/pies.c b/src/pies.c
index ff36269..bdd8ae2 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -974,7 +974,7 @@ _cb_redir (enum grecs_callback_command cmd,
locus))
return 1;
if (strtotok (redirtab, value->v.arg.v[0]->v.string, &res))
- grecs_error (locus, 0, _("%s: unrecognised redirector type"),
+ grecs_error (locus, 0, _("%s: unrecognized redirector type"),
value->v.arg.v[0]->v.string);
else
{
@@ -1099,7 +1099,7 @@ _cb_mode (enum grecs_callback_command cmd,
if (grecs_assert_node_value_type (cmd, node, GRECS_TYPE_STRING))
return 1;
if (strtotok (modetab, value->v.string, &res))
- grecs_error (locus, 0, _("%s: unrecognised mode"), value->v.string);
+ grecs_error (locus, 0, _("%s: unrecognized mode"), value->v.string);
else
*(enum pies_comp_mode *) varptr = res;
return 0;
@@ -1174,7 +1174,7 @@ _cb_flags (enum grecs_callback_command cmd,
case GRECS_TYPE_STRING:
if (str_to_cf (value->v.string, flags))
{
- grecs_error (locus, 0, _("%s: unrecognised flag"), value->v.string);
+ grecs_error (locus, 0, _("%s: unrecognized flag"), value->v.string);
return 1;
}
break;
@@ -1190,7 +1190,7 @@ _cb_flags (enum grecs_callback_command cmd,
return 1;
if (str_to_cf (vp->v.string, flags))
{
- grecs_error (locus, 0, _("%s: unrecognised flag"),
+ grecs_error (locus, 0, _("%s: unrecognized flag"),
vp->v.string);
return 1;
}
diff --git a/src/piesctl.c b/src/piesctl.c
index aa983ee..ed30b65 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -1274,7 +1274,7 @@ pcond_parse_unary (struct cmdline_parser_state *state, struct json_value **ret)
pcond_parse_or (state, ret);
term = next_token (state);
if (!term || term[0] != ')')
- parse_error ("%s", _("unbalanced parentesis"));
+ parse_error ("%s", _("unbalanced parenthesis"));
}
else
parse_error (_("parse error at %s"), term);
diff --git a/src/progman.c b/src/progman.c
index a6dc418..88f9afa 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -1402,7 +1402,7 @@ check_stopping (struct prog *prog, time_t now)
{
if (prog->pid == 0)
logmsg (LOG_EMERG,
- _("INTERNAL ERROR: attempting to kill unexisting process %s"),
+ _("INTERNAL ERROR: attempting to kill nonexistent process %s"),
prog_tag (prog));
else if (prog->v.p.comp->flags & CF_SIGGROUP)
kill (-prog->pid, SIGKILL);
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 5c3f785..6921b2b 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -40,7 +40,7 @@ _EOT
])
m4_define([PIES_STOP],[
-piesctl --url "$PIES_CTLSOCK" shutdown
+piesctl --no-netrc --url "$PIES_CTLSOCK" shutdown
pies_stop_spinner=0
while test -f $PIES_PIDFILE
do

Return to:

Send suggestions and report system problems to the System administrator.