summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2016-03-30 15:49:10 -0400
committerJoey Hess2016-03-30 15:49:10 -0400
commit4980372dbe7d10e9451cd5e5357bf3e6886a1beb (patch)
tree4ef2a26075405724db86faf16832b2127a29f610 /doc
parent6625f72f3527c46f5da307244a3d88e886e35f3a (diff)
parentf03ba9aa382baa0f6394ad9125573f0ee7b7af2f (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'doc')
-rw-r--r--doc/news/version_2.15.3.mdwn5
-rw-r--r--doc/news/version_2.17.2.mdwn8
-rw-r--r--doc/todo/problem_with_spin_after_new_dependencies_added.mdwn2
-rw-r--r--doc/todo/problem_with_spin_after_new_dependencies_added/comment_1_3adbcc7db82f14d10c7efaba889ab009._comment12
4 files changed, 22 insertions, 5 deletions
diff --git a/doc/news/version_2.15.3.mdwn b/doc/news/version_2.15.3.mdwn
deleted file mode 100644
index a8a2a53e..00000000
--- a/doc/news/version_2.15.3.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-propellor 2.15.3 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Added Git.bareRepoDefaultBranch property
- Thanks, Sean Whitton.
- * Add missing Control.Applicative imports needed by older versions of ghc."""]] \ No newline at end of file
diff --git a/doc/news/version_2.17.2.mdwn b/doc/news/version_2.17.2.mdwn
new file mode 100644
index 00000000..3b11ec89
--- /dev/null
+++ b/doc/news/version_2.17.2.mdwn
@@ -0,0 +1,8 @@
+propellor 2.17.2 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * When new dependencies are added to propellor or the propellor config,
+ try harder to get them installed. In particular, this makes
+ propellor --spin work when the remote host needs to get dependencies
+ installed in order to build the updated config.
+ * Apt.update: Also run dpkg --configure -a here as apt for some reason
+ won't even update if dpkg was interrupted."""]] \ No newline at end of file
diff --git a/doc/todo/problem_with_spin_after_new_dependencies_added.mdwn b/doc/todo/problem_with_spin_after_new_dependencies_added.mdwn
index 3a2c97af..a7b94472 100644
--- a/doc/todo/problem_with_spin_after_new_dependencies_added.mdwn
+++ b/doc/todo/problem_with_spin_after_new_dependencies_added.mdwn
@@ -44,3 +44,5 @@ vs when propellor built ok, ran, and exited nonzero due to a failing property?
(Note that the cron job runs the depsCommand if cabal configure fails,
so deps do get installed that way, only --spin is a problem.)
+
+> [[done]] --[[Joey]]
diff --git a/doc/todo/problem_with_spin_after_new_dependencies_added/comment_1_3adbcc7db82f14d10c7efaba889ab009._comment b/doc/todo/problem_with_spin_after_new_dependencies_added/comment_1_3adbcc7db82f14d10c7efaba889ab009._comment
new file mode 100644
index 00000000..9020078c
--- /dev/null
+++ b/doc/todo/problem_with_spin_after_new_dependencies_added/comment_1_3adbcc7db82f14d10c7efaba889ab009._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="comment 1"
+ date="2016-03-30T19:30:50Z"
+ content="""
+Well, I don't see a way around needing to release a version of propellor that fixes this bug before I can release a version of propellor that depends on the fix (by adding a new dependency on concurrent-output).
+
+So, I'll go that route. Users will need to upgrade all deployed hosts to propellor 2.17.2 first, before 3.0.0. If a user neglects to do so, and tries to update a host using propellor --spin, it will fail. The user can then either
+
+1. Wait for the cron job to run, if they set it up, which will install the deps.
+2. Manually log into the host and fix the deps by eg, cabal install concurrent-output as root.
+"""]]