summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/jobs.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54fac61ca..56a6ea228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-27 Mikael Magnusson <mikachu@gmail.com>
+
+ * 33561: Src/jobs.c: The time builtin forgot to unmetafy TIMEFMT.
+
2014-10-26 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 33564: Test/A05execution.ztst: more care with monitor option.
diff --git a/Src/jobs.c b/Src/jobs.c
index 18bb648d9..d312b2380 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -702,7 +702,7 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
#endif
queue_signals();
- if (!(s = getsparam("TIMEFMT")))
+ if (!(s = unmetafy(getsparam("TIMEFMT"), NULL)))
s = DEFAULT_TIMEFMT;
for (; *s; s++)