OSSP CVS Repository

ossp - Check-in [5187]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5187
Date: 2005-Oct-02 16:23:12 (local)
2005-Oct-02 14:23:12 (UTC)
User:rse
Branch:
Comment: "shtool mdate" needs to (un|re)set TIME_STYLE, as GNU coreutils' "ls" changes its time format in response to the TIME_STYLE variable.

Submitted by: James Rowe <jnrowe@ukfsn.org>

Tickets:
Inspections:
Files:
ossp-pkg/shtool/ChangeLog      1.217 -> 1.218     4 inserted, 0 deleted
ossp-pkg/shtool/THANKS      1.34 -> 1.35     1 inserted, 1 deleted
ossp-pkg/shtool/sh.mdate      1.15 -> 1.16     8 inserted, 0 deleted

ossp-pkg/shtool/ChangeLog 1.217 -> 1.218

--- ChangeLog    2005/10/02 14:18:34     1.217
+++ ChangeLog    2005/10/02 14:23:12     1.218
@@ -11,6 +11,10 @@
 
  Changes between 2.0.2 and 2.0.3 (15-Jun-2005 to 02-Oct-2005):
 
+   *) "shtool mdate" needs to (un|re)set TIME_STYLE, as GNU coreutils'
+      "ls" changes its time format in response to the TIME_STYLE variable.
+      [James Rowe <jnrowe@ukfsn.org>]
+
    *) Use "env -i sort" for Linux detections in "shtool platform" 
       to circumvent LC_COLLATE and LANG environment problems.
       [Ralf S. Engelschall]


ossp-pkg/shtool/THANKS 1.34 -> 1.35

--- THANKS       2005/05/13 18:52:40     1.34
+++ THANKS       2005/10/02 14:23:12     1.35
@@ -31,7 +31,7 @@
   o Liones                   <liones@myrealbox.com>
   o Thomas Lotterer          <thomas@lotterer.net>
   o Markus F.X.J. Oberhumer  <markus.oberhumer@jk.uni-linz.ac.at>
-  o James Rowe               <Jay@jnrowe.ukfsn.org>
+  o James Rowe               <jnrowe@ukfsn.org>
   o Benjamin Saller          <case@appliedtheory.com>
   o Michael Schloh           <michael@schloh.com>
   o Christoph Schug          <chris@schug.net>


ossp-pkg/shtool/sh.mdate 1.15 -> 1.16

--- sh.mdate     2005/06/15 08:14:35     1.15
+++ sh.mdate     2005/10/02 14:23:12     1.16
@@ -51,6 +51,14 @@
 LC_ALL=C;  export LC_ALL
 LC_TIME=C; export LC_TIME
 
+#   GNU ls changes its time format in response to the TIME_STYLE
+#   variable. Since we cannot assume "unset" works, revert this
+#   variable to its documented default.
+if [ ".$TIME_STYLE" != . ]; then
+    TIME_STYLE=posix-long-iso
+    export TIME_STYLE
+fi
+
 #   get the extended ls output of the file or directory.
 if /bin/ls -L /dev/null >/dev/null 2>&1; then
     set - x`/bin/ls -L -l -d $fod`

CVSTrac 2.0.1