From ecb4a30548a73b57981f029226ee7ae06bcfe344 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Oct 2013 10:28:13 -0400 Subject: [PATCH] Work around sed output difference that led to version containing a newline on OSX. --- Build/Version.hs | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Build/Version.hs b/Build/Version.hs index 98e0dbfd22..e34237e5b0 100644 --- a/Build/Version.hs +++ b/Build/Version.hs @@ -32,7 +32,7 @@ getVersion = do ( return changelogversion , catchDefaultIO changelogversion $ do let major = takeWhile (/= '.') changelogversion - autoversion <- readProcess "sh" + autoversion <- takeWhile isAlphaNum <$> readProcess "sh" [ "-c" , "git log -n 1 --format=format:'%ci %h'| sed -e 's/-//g' -e 's/ .* /-g/'" ] "" diff --git a/debian/changelog b/debian/changelog index 68d74597da..d2234d8107 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low * status: Fix a crash if a temp file went away while its size was being checked for status. * Deal with git check-attr -z output format change in git 1.8.5. + * Work around sed output difference that led to version containing a newline + on OSX. -- Joey Hess Thu, 03 Oct 2013 15:41:24 -0400