launchpad-reviewers team mailing list archive

[Ines Almeida <mp+489858@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad:change-appserver-logrotate-to-hourly into launchpad:master.

Commit message:
Add flag to prevent error when updating appserver logrotate config

This ensures we only rm the file if it exists

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/489858

Config is working nicely, but when changing from `houly` (typo) to `daily` it can produce an error. This prevents that error
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad:change-appserver-logrotate-to-hourly into launchpad:master.

diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
index 48d6ad6..2f17331 100644
--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
@@ -104,7 +104,11 @@ def configure_logrotate(config):
         )
     else:
         subprocess.run(
-            ["rm", "/etc/systemd/system/logrotate.timer.d/override.conf"],
+            [
+                "rm",
+                "-f",
+                "/etc/systemd/system/logrotate.timer.d/override.conf",
+            ],
             check=True,
         )