From 0dd226736313e51b896eacc5498b3964bf04e5c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2016 11:39:02 -0400 Subject: note --- doc/contributing.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/contributing.mdwn b/doc/contributing.mdwn index 84aa5d64..e75784df 100644 --- a/doc/contributing.mdwn +++ b/doc/contributing.mdwn @@ -17,3 +17,7 @@ Propellor has its own [[coding_style]], which you are encouraged to follow -- at least when you want to get a patch merged into propellor. When writing code for your own internal use, feel free to ignore all the rules, except the ones about avoiding partial functions. + +Also, mainline Propellor aims to be buildable with the version of ghc +shipped in Debian stable. And, additional weighty dependencies are best +avoided. -- cgit v1.2.3 From 066291f50a3f8b3e10287a9e708166947a8c211c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2016 12:09:45 -0400 Subject: comment --- .../comment_7_dd93ac4f42dab131aa75fece53e51067._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_7_dd93ac4f42dab131aa75fece53e51067._comment (limited to 'doc') diff --git a/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_7_dd93ac4f42dab131aa75fece53e51067._comment b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_7_dd93ac4f42dab131aa75fece53e51067._comment new file mode 100644 index 00000000..5a488d25 --- /dev/null +++ b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_7_dd93ac4f42dab131aa75fece53e51067._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 7""" + date="2016-03-28T16:06:43Z" + content=""" +sm noticed that running the propellor wrapper after stack install propellor +sets up ~/.propellor/ but fails to build in there, because it uses cabal. + +So, it appeared to him as if the propellor command didn't accept switches, +since it never got to the point of running propellor-config. Which is +pretty confusing behavior. + +To fully support stack, the wrapper or build process would need to notice +that it was installed using stack, and build using stack. This conflicts +somewhat with my idea about noticing if stack.yaml exists as the flag. +"""]] -- cgit v1.2.3 From 5849073ce68ac1f1f947d9c059bdbd17337f754f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2016 12:38:25 -0400 Subject: idea --- doc/todo/commandline_to_setup_minimal_repo.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/commandline_to_setup_minimal_repo.mdwn (limited to 'doc') diff --git a/doc/todo/commandline_to_setup_minimal_repo.mdwn b/doc/todo/commandline_to_setup_minimal_repo.mdwn new file mode 100644 index 00000000..3925a779 --- /dev/null +++ b/doc/todo/commandline_to_setup_minimal_repo.mdwn @@ -0,0 +1,3 @@ +Make propellor --init be a way to set up ~/.propellor. This would allow +parameters, like --minimal to clone the minimal config repo instead of the +full one, or --stack to set up ~/.propellor to use stack. --[[Joey]] -- cgit v1.2.3 From bbddb2cbc03bac702f90a77c37c8f2b7c65ad37e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2016 13:05:06 -0400 Subject: idea --- doc/todo/commandline_to_setup_minimal_repo.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/commandline_to_setup_minimal_repo.mdwn b/doc/todo/commandline_to_setup_minimal_repo.mdwn index 3925a779..5e82ed0f 100644 --- a/doc/todo/commandline_to_setup_minimal_repo.mdwn +++ b/doc/todo/commandline_to_setup_minimal_repo.mdwn @@ -1,3 +1,5 @@ Make propellor --init be a way to set up ~/.propellor. This would allow parameters, like --minimal to clone the minimal config repo instead of the full one, or --stack to set up ~/.propellor to use stack. --[[Joey]] + +> Or, it could be an interactive setup process. --[[Joey]] -- cgit v1.2.3 From 65e2a3b5e7a54db44ff8e484440332c17b436fbc Mon Sep 17 00:00:00 2001 From: gueux Date: Mon, 28 Mar 2016 19:39:22 +0000 Subject: Added a comment --- .../comment_5_b73901c0aa408d35346c46e523be8c3f._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_5_b73901c0aa408d35346c46e523be8c3f._comment (limited to 'doc') diff --git a/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_5_b73901c0aa408d35346c46e523be8c3f._comment b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_5_b73901c0aa408d35346c46e523be8c3f._comment new file mode 100644 index 00000000..61f34253 --- /dev/null +++ b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_5_b73901c0aa408d35346c46e523be8c3f._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="gueux" + subject="comment 5" + date="2016-03-28T19:39:22Z" + content=""" +The error message is one thing, but shouldn't the container built with Systemd.container be clonable? Maybe by adding an additional \"export-tar/import-tar\" step to Systemd.container or by using something different from mkchroot? +"""]] -- cgit v1.2.3 From 863e3d03d1c268acc95e3ceab5c1c36d764eb250 Mon Sep 17 00:00:00 2001 From: picca Date: Tue, 29 Mar 2016 16:58:05 +0000 Subject: Added a comment --- ...ent_2_be3846f1cf7853beb486afc2077cd8b2._comment | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_2_be3846f1cf7853beb486afc2077cd8b2._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_2_be3846f1cf7853beb486afc2077cd8b2._comment b/doc/forum/chroot_issue_when_upgrading/comment_2_be3846f1cf7853beb486afc2077cd8b2._comment new file mode 100644 index 00000000..6999ceb1 --- /dev/null +++ b/doc/forum/chroot_issue_when_upgrading/comment_2_be3846f1cf7853beb486afc2077cd8b2._comment @@ -0,0 +1,29 @@ +[[!comment format=mdwn + username="picca" + subject="comment 2" + date="2016-03-29T16:58:05Z" + content=""" +Hello, joey now that I installed 2.17.1 I can test the fix but... + + [2016-03-29 16:50:06 UTC] call: apt-get [\"update\"] + [2016-03-29 16:50:06 UTC] fgProcess (\"apt-get\",[\"update\"]) + E: dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. + [2016-03-29 16:50:07 UTC] fgProcess done (\"apt-get\",[\"update\"]) + [2016-03-29 16:50:07 UTC] process done ExitFailure 100 + +my property is + + chroot = Chroot.debootstrapped Debootstrap.BuilddD chrootdir + & os system + & case proxy of + (Just p) -> \"/etc/apt/apt.conf.d/01proxy\" `File.hasContent` [\"Acquire::http::Proxy \\"\" ++ p ++ \"\\";\"] + Nothing -> doNothing + & Apt.installed [\"apt-transport-https\"] + & Apt.stdSourcesList + & Apt.update `onChange` Apt.upgrade + & Apt.cacheCleaned + +so it failes in the Apt.update and do not reach Apt.upgrade +so it seems that update should be fixed also :) + +"""]] -- cgit v1.2.3 From c48734099c153b2f79b16e4776da01be590c6675 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Mar 2016 16:55:38 -0400 Subject: comment --- .../comment_3_f902730900901dccdf2e290a176458f9._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_3_f902730900901dccdf2e290a176458f9._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_3_f902730900901dccdf2e290a176458f9._comment b/doc/forum/chroot_issue_when_upgrading/comment_3_f902730900901dccdf2e290a176458f9._comment new file mode 100644 index 00000000..17c02fe7 --- /dev/null +++ b/doc/forum/chroot_issue_when_upgrading/comment_3_f902730900901dccdf2e290a176458f9._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2016-03-29T20:49:32Z" + content=""" +Hmm, I don't ever remember seeing apt-get update need dpkg --configure -a. +It's rather weird that it would; the files it updates are fully independent +of the files dpkg does AIUI. +"""]] -- cgit v1.2.3 From 1f25dec32626d8d8d724bfb54131b581ed0ab9c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Mar 2016 17:15:37 -0400 Subject: update --- ...ent_9_3f3028244efa8a6528a4530bca4cb222._comment | 11 +++++++++++ ...ent_6_3394c1a7a485057fda84dd910e29d90f._comment | 23 ++++++++++++++++++++++ ...ent_1_3f3028244efa8a6528a4530bca4cb222._comment | 11 ----------- ...ent_1_f4b5e7c3e42dcb979a309873bb3491ae._comment | 8 -------- 4 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 doc/forum/Shared_connection_to_xxx_closed./comment_9_3f3028244efa8a6528a4530bca4cb222._comment create mode 100644 doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_6_3394c1a7a485057fda84dd910e29d90f._comment delete mode 100644 doc/forum/doc/forum/Shared_connection_to_xxx_closed./comment_1_3f3028244efa8a6528a4530bca4cb222._comment delete mode 100644 doc/forum/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_1_f4b5e7c3e42dcb979a309873bb3491ae._comment (limited to 'doc') diff --git a/doc/forum/Shared_connection_to_xxx_closed./comment_9_3f3028244efa8a6528a4530bca4cb222._comment b/doc/forum/Shared_connection_to_xxx_closed./comment_9_3f3028244efa8a6528a4530bca4cb222._comment new file mode 100644 index 00000000..e5378cc7 --- /dev/null +++ b/doc/forum/Shared_connection_to_xxx_closed./comment_9_3f3028244efa8a6528a4530bca4cb222._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-09-25T13:31:47Z" + content=""" +Ah, I remember seeing this once myself. ghc and cabal don't get the binary +updated atomically. + +I've got a fix on the joeyconfig branch, it makes sure the binary is built +and then atomically updates a copy that's used to run propellor. +"""]] diff --git a/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_6_3394c1a7a485057fda84dd910e29d90f._comment b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_6_3394c1a7a485057fda84dd910e29d90f._comment new file mode 100644 index 00000000..9ae8219c --- /dev/null +++ b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_6_3394c1a7a485057fda84dd910e29d90f._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2016-03-29T21:09:25Z" + content=""" + clone NAME NAME + Clones a container or VM image. The arguments specify the + name of the image to clone and the name of the newly + cloned image. Note that plain directory container images + are cloned into subvolume images with this command. + +That seems to say that the directory that Systemd.container sets up +should be clonable too. Perhaps this is a systemd bug? + +If systemd needs a container to be loaded from a tarball in order to be +clonable this way, I guess I would not mind if Systemd.container did that +as part of its initial bootstrapping. But it is extra work so I'd like to +make sure that it's really intended to need to do that. + +(Myself, I don't care if I can't clone a container; I can delete any of them +and propellor can rebuild them, or even move the line to a different host +in config.hs to relocate the container.) +"""]] diff --git a/doc/forum/doc/forum/Shared_connection_to_xxx_closed./comment_1_3f3028244efa8a6528a4530bca4cb222._comment b/doc/forum/doc/forum/Shared_connection_to_xxx_closed./comment_1_3f3028244efa8a6528a4530bca4cb222._comment deleted file mode 100644 index e5378cc7..00000000 --- a/doc/forum/doc/forum/Shared_connection_to_xxx_closed./comment_1_3f3028244efa8a6528a4530bca4cb222._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 1""" - date="2015-09-25T13:31:47Z" - content=""" -Ah, I remember seeing this once myself. ghc and cabal don't get the binary -updated atomically. - -I've got a fix on the joeyconfig branch, it makes sure the binary is built -and then atomically updates a copy that's used to run propellor. -"""]] diff --git a/doc/forum/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_1_f4b5e7c3e42dcb979a309873bb3491ae._comment b/doc/forum/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_1_f4b5e7c3e42dcb979a309873bb3491ae._comment deleted file mode 100644 index 91a63af4..00000000 --- a/doc/forum/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_1_f4b5e7c3e42dcb979a309873bb3491ae._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 1""" - date="2015-09-25T13:33:42Z" - content=""" -I'm guessing this could be due to systemd not having the btrfs volume stuff -it needs for cloning. Don't really know though. -"""]] -- cgit v1.2.3 From 6a429dccd8d9cc184198d2bae0a7da2256d3153d Mon Sep 17 00:00:00 2001 From: picca Date: Tue, 29 Mar 2016 21:36:11 +0000 Subject: Added a comment --- .../comment_4_4004abde37eb4bc7d845fb7bba2c635d._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_4_4004abde37eb4bc7d845fb7bba2c635d._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_4_4004abde37eb4bc7d845fb7bba2c635d._comment b/doc/forum/chroot_issue_when_upgrading/comment_4_4004abde37eb4bc7d845fb7bba2c635d._comment new file mode 100644 index 00000000..65ca065e --- /dev/null +++ b/doc/forum/chroot_issue_when_upgrading/comment_4_4004abde37eb4bc7d845fb7bba2c635d._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="picca" + subject="comment 4" + date="2016-03-29T21:36:11Z" + content=""" +I found this in the apt code + + #: apt-pkg/deb/debsystem.cc:82 + msgid \"\" + \"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct \" + \"the problem. \" + msgstr \"\" + +"""]] -- cgit v1.2.3 From 65242c9b280dce4baffb78ea313887159bf67d19 Mon Sep 17 00:00:00 2001 From: picca Date: Tue, 29 Mar 2016 21:39:42 +0000 Subject: Added a comment --- ...ent_5_9450d3aad28f45370d32a187c891dbf5._comment | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment b/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment new file mode 100644 index 00000000..0f4fbb85 --- /dev/null +++ b/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="picca" + subject="comment 5" + date="2016-03-29T21:39:42Z" + content=""" +Here the c++ code of apt + + // See if we need to abort with a dirty journal + if (CheckUpdates() == true) + { + close(d->LockFD); + d->LockFD = -1; + const char *cmd; + if (getenv(\"SUDO_USER\") != NULL) + cmd = \"sudo dpkg --configure -a\"; + else + cmd = \"dpkg --configure -a\"; + // TRANSLATORS: the %s contains the recovery command, usually + // dpkg --configure -a + return _error->Error(_(\"dpkg was interrupted, you must manually \" + \"run '%s' to correct the problem. \"), cmd); + } + + +"""]] -- cgit v1.2.3 From 0209ad7c7b2b8b5b08542fdeb4428294b65df13e Mon Sep 17 00:00:00 2001 From: picca Date: Tue, 29 Mar 2016 21:40:02 +0000 Subject: removed --- ...ent_5_9450d3aad28f45370d32a187c891dbf5._comment | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment b/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment deleted file mode 100644 index 0f4fbb85..00000000 --- a/doc/forum/chroot_issue_when_upgrading/comment_5_9450d3aad28f45370d32a187c891dbf5._comment +++ /dev/null @@ -1,25 +0,0 @@ -[[!comment format=mdwn - username="picca" - subject="comment 5" - date="2016-03-29T21:39:42Z" - content=""" -Here the c++ code of apt - - // See if we need to abort with a dirty journal - if (CheckUpdates() == true) - { - close(d->LockFD); - d->LockFD = -1; - const char *cmd; - if (getenv(\"SUDO_USER\") != NULL) - cmd = \"sudo dpkg --configure -a\"; - else - cmd = \"dpkg --configure -a\"; - // TRANSLATORS: the %s contains the recovery command, usually - // dpkg --configure -a - return _error->Error(_(\"dpkg was interrupted, you must manually \" - \"run '%s' to correct the problem. \"), cmd); - } - - -"""]] -- cgit v1.2.3 From 8461cad491c085c9e6211574671e6621134ed53b Mon Sep 17 00:00:00 2001 From: picca Date: Tue, 29 Mar 2016 21:41:50 +0000 Subject: Added a comment --- ...ent_5_fe9deffb0cd356787fed33a373115f73._comment | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_5_fe9deffb0cd356787fed33a373115f73._comment (limited to 'doc') diff --git a/doc/forum/chroot_issue_when_upgrading/comment_5_fe9deffb0cd356787fed33a373115f73._comment b/doc/forum/chroot_issue_when_upgrading/comment_5_fe9deffb0cd356787fed33a373115f73._comment new file mode 100644 index 00000000..43f12d0f --- /dev/null +++ b/doc/forum/chroot_issue_when_upgrading/comment_5_fe9deffb0cd356787fed33a373115f73._comment @@ -0,0 +1,26 @@ +[[!comment format=mdwn + username="picca" + subject="comment 5" + date="2016-03-29T21:41:50Z" + content=""" +Here the c++ code of apt + + // See if we need to abort with a dirty journal + if (CheckUpdates() == true) + { + close(d->LockFD); + d->LockFD = -1; + const char *cmd; + if (getenv(\"SUDO_USER\") != NULL) + cmd = \"sudo dpkg --configure -a\"; + else + cmd = \"dpkg --configure -a\"; + // TRANSLATORS: the %s contains the recovery command, usually + // dpkg --configure -a + return _error->Error(_(\"dpkg was interrupted, you must manually \" + \"run '%s' to correct the problem. \"), cmd); + } + +so there is a dirty journal. (maybe due to a power off during the chroot update) + +"""]] -- cgit v1.2.3 From 27215363dd9babb0d486521543b930915619e82e Mon Sep 17 00:00:00 2001 From: gueux Date: Wed, 30 Mar 2016 11:32:51 +0000 Subject: Added a comment --- .../comment_7_5a3418e8cc800ceea5988059b6d86aff._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_7_5a3418e8cc800ceea5988059b6d86aff._comment (limited to 'doc') diff --git a/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_7_5a3418e8cc800ceea5988059b6d86aff._comment b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_7_5a3418e8cc800ceea5988059b6d86aff._comment new file mode 100644 index 00000000..e6e24c42 --- /dev/null +++ b/doc/forum/Systemd.container_produces_non-standard_systemd_container/comment_7_5a3418e8cc800ceea5988059b6d86aff._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="gueux" + subject="comment 7" + date="2016-03-30T11:32:51Z" + content=""" +After a chat session on #systemd, I've posted a new issue https://github.com/systemd/systemd/issues/2914 +There should be updates soon. +"""]] -- cgit v1.2.3 From adc7dad3d8b86b1ad770d1c82a66cd4df7bbee20 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Mar 2016 10:44:27 -0400 Subject: Apt.update: Also run dpkg --configure -a here as apt for some reason won't even update if dpkg was interrupted. --- debian/changelog | 2 ++ .../comment_6_262df826e5bbd0130964e0433fb172f2._comment | 7 +++++++ src/Propellor/Property/Apt.hs | 8 +++++--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 doc/forum/chroot_issue_when_upgrading/comment_6_262df826e5bbd0130964e0433fb172f2._comment (limited to 'doc') 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 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. -- cgit v1.2.3