diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-16 10:28:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-16 10:28:13 -0400 |
| commit | 2793def21b17b8e1ba5730dc970dc7f825cbc0cb (patch) | |
| tree | 8a6af730c0b03977ea48ee2cb5f731e03c8e3781 | |
| parent | bd2e72739a1fb9f3a3921a9ae1857aaa7b7b9dba (diff) | |
Work around sed output difference that led to version containing a newline on OSX.
| -rw-r--r-- | Build/Version.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Build/Version.hs b/Build/Version.hs index 98e0dbfd2..e34237e5b 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 68d74597d..d2234d810 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 <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 |