summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment41
-rw-r--r--doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment38
-rw-r--r--doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment7
-rw-r--r--doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment8
-rw-r--r--src/Propellor/Property/Git.hs2
-rw-r--r--src/Propellor/Property/Sbuild.hs2
7 files changed, 98 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b7dafc8c..139a2a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ propellor (5.8.0) UNRELEASED; urgency=medium
exist.
* Ssh.userKeyAt: When a relative filepath is provided, it's put inside
the user's .ssh directory.
+ * fix Git.pulled always reporting a change
+ Thanks, Sean Whitton
-- Joey Hess <id@joeyh.name> Mon, 08 Apr 2019 11:09:04 -0400
diff --git a/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment b/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment
new file mode 100644
index 00000000..f6d33302
--- /dev/null
+++ b/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment
@@ -0,0 +1,41 @@
+[[!comment format=mdwn
+ username="Nicolas.Schodet"
+ avatar="http://cdn.libravatar.org/avatar/0d7ec808ec329d04ee9a93c0da3c0089"
+ subject="comment 4"
+ date="2019-04-20T21:54:16Z"
+ content="""
+After thinking about it, it would be nicer if an Host could give information about
+several of its children, that would be a larger change, but having the wrapper
+would then be useless and propellor would be able to find containers
+automatically.
+
+As a container is created by a property, a container Host could be included in
+Info of a Host. If an entry is to be propagated, then it is added as an entry
+of the host, else it is kept as an entry of the container.
+
+When looking up a host, we have to search for one Host of a [Host] list, but
+also for any Host listed in the containersInfo of all the listed Host.
+
+Not sure this is clear, here is a example to try to make it clearer:
+
+ hard_node :: Host
+ hostName = \"hard-node.example.org\"
+ hostProperties = ...
+ hostInfo =
+ [ a HostKeyInfo for riva
+ , a DnsInfoUnpropagated for riva
+ , a DnsInfoPropagated from container-web
+ , a ContainersInfo =
+ [ container_web :: Host
+ hostName = \"container-web\"
+ hostProperties = ...
+ hostInfo =
+ [ a HostKeyInfo for container-web
+ , a DnsInfoUnpropagated for container-web
+ ]
+ , container_git :: Host
+ ...
+ ]
+ ]
+
+"""]]
diff --git a/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment b/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment
new file mode 100644
index 00000000..5173511c
--- /dev/null
+++ b/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment
@@ -0,0 +1,38 @@
+[[!comment format=mdwn
+ username="desired.mta@88576fa3c90538abed47d3f0aa48d00bcc903b23"
+ nickname="desired.mta"
+ avatar="http://cdn.libravatar.org/avatar/d93af7ba58088a39d04c7da13fc176ee"
+ subject="comment 3"
+ date="2019-04-20T09:10:52Z"
+ content="""
+Thanks for your responses! I wasn't aware there was prior work done on this.
+
+`origin/precompiled` did not build for me. But when I merged master into it, and patching around a trivial merge conflict, I got this:
+
+```
+[ 58 of 182] Compiling Propellor.Property ( src/Propellor/Property.hs, dist/build/Propellor/Property.o )
+
+src/Propellor/Property.hs:364:13: error:
+ * Could not deduce (Monoid (Property (MetaTypes t)))
+ arising from a use of `mempty'
+ from the context: SingI t
+ bound by the type signature for:
+ doNothing :: forall k (t :: k). SingI t => Property (MetaTypes t)
+ at src/Propellor/Property.hs:363:1-46
+ * In the expression: mempty
+ In an equation for `doNothing': doNothing = mempty
+ |
+364 | doNothing = mempty
+ | ^^^^^^
+```
+
+Unfortunately, I am not versed enough in Haskell to understand the error.
+
+
+```
+$ ghc --version
+The Glorious Glasgow Haskell Compilation System, version 8.4.4
+```
+
+Here is my merged fork (based on 38b4da93 and origin/precompiled at 7d550c75): if you can `make` it: [github.com/motiejus/propellor](https://github.com/motiejus/propellor), and tell me how to fix the above error, I would try to test it functionally further.
+"""]]
diff --git a/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment b/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment
new file mode 100644
index 00000000..eff55db0
--- /dev/null
+++ b/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2019-04-22T17:14:20Z"
+ content="""
+I've fixed the build of origin/precompiled
+"""]]
diff --git a/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment
new file mode 100644
index 00000000..75f6afd5
--- /dev/null
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb"
+ subject="patches submitted"
+ date="2019-04-18T20:58:35Z"
+ content="""
+I've just mailed patches addressing this to Joey.
+"""]]
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])
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,