From 90efcd3203d64c2c5691e30ccc23307aae8d20c8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Mar 2014 15:31:57 -0400 Subject: refactor --- Property/Apt.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Property/Apt.hs') diff --git a/Property/Apt.hs b/Property/Apt.hs index 653c0fca..a5720e72 100644 --- a/Property/Apt.hs +++ b/Property/Apt.hs @@ -6,10 +6,9 @@ import Data.List import System.IO import Control.Monad -import Property +import Common import qualified Property.File as File -import Utility.SafeCommand -import Utility.Process +import Property.File (Line) sourcesList :: FilePath sourcesList = "/etc/apt/sources.list" @@ -109,7 +108,7 @@ unattendedUpgrades enabled = installed ["unattended-upgrades"] reConfigure :: Package -> [(String, String, String)] -> Property reConfigure package vals = reconfigure `requires` setselections where - setselections = IOProperty "preseed" $ makeChange $ + setselections = Property "preseed" $ makeChange $ withHandle StdinHandle createProcessSuccess (proc "debconf-set-selections" []) $ \h -> do forM_ vals $ \(template, tmpltype, value) -> -- cgit v1.2.3