launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+473846@xxxxxxxxxxxxxxxxxx>]

Simone Pelosi has proposed merging ~pelpsi/launchpad-buildd:deb822-rm-force-fix into launchpad-buildd:master.

Commit message:
Use -f when remove files
    
If the file doesn't not exist the command shouldn't fail.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-buildd/+git/launchpad-buildd/+merge/473846
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad-buildd:deb822-rm-force-fix into launchpad-buildd:master.

diff --git a/lpbuildd/target/apt.py b/lpbuildd/target/apt.py
index 21ac77c..82d7294 100644
--- a/lpbuildd/target/apt.py
+++ b/lpbuildd/target/apt.py
@@ -103,8 +103,10 @@ class OverrideSourcesList(Operation):
                 os.fchmod(sources_list.fileno(), 0o644)
         # If the ubuntu version is >= 24.04 then use deb822 format
         else:
-            self.backend.run(["rm", "/etc/apt/sources.list.d/ubuntu.sources"])
-            self.backend.run(["rm", "/etc/apt/sources.list"])
+            self.backend.run(
+                ["rm", "-f", "/etc/apt/sources.list.d/ubuntu.sources"]
+            )
+            self.backend.run(["rm", "-f", "/etc/apt/sources.list"])
             with self.backend.open(
                 "/etc/apt/sources.list.d/lp-buildd.sources", mode="w+"
             ) as sources_list: