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

use more general module

Browse source
This commit is contained in:
Joey Hess 2016-04-21 14:32:42 -04:00
parent dab3b9c1b1
commit a3465c6327
Failed to extract signature
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assistant/Threads/Upgrader.hs
View file

@ -20,7 +20,7 @@ import Assistant.Alert
import Utility.NotificationBroadcaster import Utility.NotificationBroadcaster
import qualified Annex import qualified Annex
import qualified Build.SysConfig import qualified Build.SysConfig
import qualified Git.Version import qualified Utility.DottedVersion as DottedVersion
import Types.Distribution import Types.Distribution
#ifdef WITH_WEBAPP #ifdef WITH_WEBAPP
import Assistant.WebApp.Types import Assistant.WebApp.Types
@ -63,9 +63,9 @@ checkUpgrade urlrenderer = do
where where
go Nothing = debug [ "Failed to check if upgrade is available." ] go Nothing = debug [ "Failed to check if upgrade is available." ]
go (Just d) = do go (Just d) = do
let installed = Git.Version.normalize Build.SysConfig.packageversion let installed = DottedVersion.normalize Build.SysConfig.packageversion
let avail = Git.Version.normalize $ distributionVersion d let avail = DottedVersion.normalize $ distributionVersion d
let old = Git.Version.normalize <$> distributionUrgentUpgrade d let old = DottedVersion.normalize <$> distributionUrgentUpgrade d
if Just installed <= old if Just installed <= old
then canUpgrade High urlrenderer d then canUpgrade High urlrenderer d
else if installed < avail else if installed < avail