summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/forum/chroot_issue_when_upgrading/comment_6_262df826e5bbd0130964e0433fb172f2._comment7
-rw-r--r--src/Propellor/Property/Apt.hs8
3 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cd7a4c79..b85c836f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ propellor (2.17.1) unstable; urgency=medium
* Uwsgi: add ".ini" extension to app config files.
Files without extensions were ignored by uwsgi.
Thanks, FĂ©lix Sipma.
+ * Apt.update: Also run dpkg --configure -a here as apt for some reason
+ won't even update if dpkg was interrupted.
-- Joey Hess <id@joeyh.name> Mon, 28 Mar 2016 11:06:34 -0400
diff --git a/doc/forum/chroot_issue_when_upgrading/comment_6_262df826e5bbd0130964e0433fb172f2._comment b/doc/forum/chroot_issue_when_upgrading/comment_6_262df826e5bbd0130964e0433fb172f2._comment
new file mode 100644
index 00000000..00a282bf
--- /dev/null
+++ b/doc/forum/chroot_issue_when_upgrading/comment_6_262df826e5bbd0130964e0433fb172f2._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 6"""
+ date="2016-03-30T14:44:03Z"
+ content="""
+All right then, I've combined pendingConfigured into Apt.update.
+"""]]
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 7301a6ae..b9182baf 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -119,9 +119,11 @@ noninteractiveEnv =
]
update :: Property NoInfo
-update = runApt ["update"]
- `assume` MadeChange
- `describe` "apt update"
+update = combineProperties ("apt update")
+ [ pendingConfigured
+ , runApt ["update"]
+ `assume` MadeChange
+ ]
-- | Have apt upgrade packages, adding new packages and removing old as
-- necessary.