From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 4 May 2023 15:53:38 +0000 (-0400)
Subject: remote tailing 's' from log --raw-data
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~40^2~235
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f56f6140fa3fd570e358a7ab41672d2a4da63f5d;p=git-annex.git

remote tailing 's' from log --raw-data

log: When --raw-date is used, display only seconds from the epoch, as
documented, omitting a trailing "s" that was included in the output
before.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
---

diff --git a/CHANGELOG b/CHANGELOG
index d3de618e96..5a8daf83a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,9 @@ git-annex (10.20230408) UNRELEASED; urgency=medium
   * initremote: Avoid creating a remote that is not encrypted when gpg is
     broken.
   * rmurl, unannex: Support --json and --json-error-messages.
+  * log: When --raw-date is used, display only seconds from the epoch, as
+    documented, omitting a trailing "s" that was included in the output
+    before.
 
  -- Joey Hess <id@joeyh.name>  Sat, 08 Apr 2023 13:57:18 -0400
 
diff --git a/Command/Log.hs b/Command/Log.hs
index 869090f426..e7079b11fc 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -162,7 +162,7 @@ showLog outputter cs = forM_ cs $ \c -> do
 
 mkOutputter :: UUIDDescMap -> TimeZone -> LogOptions -> FilePath -> Outputter
 mkOutputter m zone o file
-	| rawDateOption o = normalOutput lookupdescription file show
+	| rawDateOption o = normalOutput lookupdescription file rawTimeStamp
 	| gourceOption o = gourceOutput lookupdescription file
 	| otherwise = normalOutput lookupdescription file (showTimeStamp zone)
   where
@@ -292,3 +292,6 @@ parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (giveup "bad timestamp") .
 showTimeStamp :: TimeZone -> POSIXTime -> String
 showTimeStamp zone = formatTime defaultTimeLocale rfc822DateFormat 
 	. utcToZonedTime zone . posixSecondsToUTCTime
+
+rawTimeStamp :: POSIXTime -> String
+rawTimeStamp t = filter (/= 's') (show t)