diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-01 23:49:15 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-01 23:49:15 -0400 |
commit | 3fae22e95b939bc8f05bbd624b8a03ea542fc345 (patch) | |
tree | 9273d74d8f8e6eab8b5fe5d4f5454e5f8815bd52 /Propellor | |
parent | a200bcd85a0d2b89ed0dea67dfe693f03ddac7e7 (diff) |
changed Arch to String type
Diffstat (limited to 'Propellor')
-rw-r--r-- | Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 | ||||
-rw-r--r-- | Propellor/Types.hs | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index cf30ba36..8fcfbd6a 100644 --- a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -6,8 +6,6 @@ import qualified Propellor.Property.User as User import qualified Propellor.Property.Cron as Cron import Propellor.Property.Cron (CronTimes) -import Data.Char - builduser :: UserName builduser = "builder" @@ -26,7 +24,7 @@ builder arch crontimes = combineProperties "gitannexbuilder" , check (lacksdir builddir) $ userScriptProperty builduser [ "git clone git://git.kitenet.net/gitannexbuilder " ++ builddir , "cd " ++ builddir - , "git checkout " ++ map toLower (show arch) + , "git checkout " ++ arch ] `describe` "gitbuilder setup" , check (lacksdir $ builddir </> "build") $ userScriptProperty builduser diff --git a/Propellor/Types.hs b/Propellor/Types.hs index c18cc7b7..bcb5efd1 100644 --- a/Propellor/Types.hs +++ b/Propellor/Types.hs @@ -40,8 +40,7 @@ data DebianSuite = Experimental | Unstable | Testing | Stable | DebianRelease Re type Release = String -data Architecture = Amd64 | I386 | Armel - deriving (Show) +type Architecture = String -- | Results of actions, with color. class ActionResult a where |