From cbf2f35d17bf2a229e17ac3d6d96a2e88d8d2ff3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Apr 2019 22:12:37 -0400 Subject: wording To me, "standardly" seemed to imply the property might be included by default, but it is not. --- src/Propellor/Property/Sbuild.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 3de82af3..26e7ae8e 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -270,7 +270,7 @@ update = Apt.update `before` Apt.upgrade `before` Apt.autoRemove -- | Ensure that an sbuild schroot uses the host's Apt proxy. -- --- This property is standardly used when the host has 'Apt.useLocalCacher'. +-- This property is typically used when the host has 'Apt.useLocalCacher'. useHostProxy :: Host -> Property DebianLike useHostProxy h = property' "use host's apt proxy" $ \w -> -- Note that we can't look at getProxyInfo outside the property, -- cgit v1.2.3 From 32c1e68cfcef57d86fbf8c19743494ee4b9f1a4f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 22 Apr 2019 12:36:30 -0700 Subject: fix Git.pulled always reporting a change Signed-off-by: Sean Whitton --- src/Propellor/Property/Git.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs index e7dcb80c..a0ed4f02 100644 --- a/src/Propellor/Property/Git.hs +++ b/src/Propellor/Property/Git.hs @@ -110,7 +110,7 @@ pulled owner url dir mbranch = go [ "cd " ++ shellEscape dir , "git pull" ] - `changesFile` (dir ".git" "FETCH_HEAD") + `changesFileContent` (dir ".git" "FETCH_HEAD") isGitDir :: FilePath -> IO Bool isGitDir dir = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", dir]) -- cgit v1.2.3 From 71de611d01156824e2ca3a8fac28e383b4be3e46 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 1 Jun 2019 10:55:49 -0300 Subject: Libvirt.installed: install libvirt-daemon-system Several things recommend libvirt-daemon, but not for whatever reason libvirt-daemon-system. This means the libvirt-daemon is not started, which can cause virt-install to fail. Installing libvirt-daemon explicitly is probably overkill, but avoids problems in case the dependencies of libvirt-daemon-system change. --- src/Propellor/Property/Libvirt.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Libvirt.hs b/src/Propellor/Property/Libvirt.hs index 4dad5f39..71f59d65 100644 --- a/src/Propellor/Property/Libvirt.hs +++ b/src/Propellor/Property/Libvirt.hs @@ -34,7 +34,7 @@ data DiskImageType = Raw -- TODO: | QCow2 -- | Install basic libvirt components installed :: Property DebianLike -installed = Apt.installed ["libvirt-clients", "virtinst"] +installed = Apt.installed ["libvirt-clients", "virtinst", "libvirt-daemon", "libvirt-daemon-system"] -- | Ensure that the default libvirt network is set to autostart, and start it. -- -- cgit v1.2.3