mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Sanitize debian changelog version before putting it into cabal file. Closes: #708619

Browse source
This commit is contained in:
Joey Hess 2013-05-17 11:24:18 -04:00
parent ebe10edf67
commit 39ac8d18ed
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Build/Configure.hs
View file

@ -10,6 +10,7 @@ import System.FilePath
import System.Environment import System.Environment
import Data.Maybe import Data.Maybe
import Control.Monad.IfElse import Control.Monad.IfElse
import Data.Char
import Build.TestConfig import Build.TestConfig
import Utility.SafeCommand import Utility.SafeCommand
@ -129,7 +130,8 @@ getSshConnectionCaching = Config "sshconnectioncaching" . BoolConfig <$>
{- Set up cabal file with version. -} {- Set up cabal file with version. -}
cabalSetup :: IO () cabalSetup :: IO ()
cabalSetup = do cabalSetup = do
version <- takeWhile (/= '~') <$> getChangelogVersion version <- takeWhile (\c -> isDigit c || c == '.')
<$> getChangelogVersion
cabal <- readFile cabalfile cabal <- readFile cabalfile
writeFile tmpcabalfile $ unlines $ writeFile tmpcabalfile $ unlines $
map (setfield "Version" version) $ map (setfield "Version" version) $

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (4.20130517) UNRELEASED; urgency=low
* Sanitize debian changelog version before putting it into cabal file.
Closes: #708619
-- Joey Hess <joeyh@debian.org> Fri, 17 May 2013 11:17:03 -0400
git-annex (4.20130516) unstable; urgency=low git-annex (4.20130516) unstable; urgency=low
* Android: The webapp is ported and working. * Android: The webapp is ported and working.