diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
| commit | ba058d77a778058887f5c678b10e3c5ac599c50c (patch) | |
| tree | f841754cb52d41ccafee719a1fc0b47c766ad7b2 /Propellor/Property/Apt.hs | |
| parent | a1e3c4e9e060c58a738501030a197557e20e88db (diff) | |
| parent | 0592ab4bd7deaadaa971bc7d19b7beaca5a1253e (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Property/Apt.hs')
| -rw-r--r-- | Propellor/Property/Apt.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs index f45bc2e6..3842cb02 100644 --- a/Propellor/Property/Apt.hs +++ b/Propellor/Property/Apt.hs @@ -103,7 +103,7 @@ installed' params ps = robustly $ check (isInstallable ps) go go = runApt $ params ++ ["install"] ++ ps installedBackport :: [Package] -> Property -installedBackport ps = withOS desc $ \o -> case o of +installedBackport ps = trivial $ withOS desc $ \o -> case o of Nothing -> error "cannot install backports; os not declared" (Just (System (Debian suite) _)) | isStable suite -> @@ -200,7 +200,7 @@ reConfigure package vals = reconfigure `requires` setselections forM_ vals $ \(tmpl, tmpltype, value) -> hPutStrLn h $ unwords [package, tmpl, tmpltype, value] hClose h - reconfigure = cmdProperty "dpkg-reconfigure" ["-fnone", package] + reconfigure = cmdProperty' "dpkg-reconfigure" ["-fnone", package] noninteractiveEnv -- | Ensures that a service is installed and running. -- |