launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+473136@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
deb822 support
    
Apt supports One-Line-Style format. Create a file buildd.list inside
/etc/apt/sources.list.d/ to follow the new deb822 specifications.

https://repolib.readthedocs.io/en/latest/deb822-format.html

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/lpbuildd/target/apt.py b/lpbuildd/target/apt.py
index 3f9ddca..6021697 100644
--- a/lpbuildd/target/apt.py
+++ b/lpbuildd/target/apt.py
@@ -29,7 +29,7 @@ class OverrideSourcesList(Operation):
     def run(self):
         logger.info("Overriding sources.list in build-%s", self.args.build_id)
         with self.backend.open(
-            "/etc/apt/sources.list", mode="w+"
+            "/etc/apt/sources.list.d/buildd.list", mode="w+"
         ) as sources_list:
             for archive in self.args.archives:
                 print(archive, file=sources_list)
diff --git a/lpbuildd/target/tests/test_apt.py b/lpbuildd/target/tests/test_apt.py
index 26eac33..bbd6542 100644
--- a/lpbuildd/target/tests/test_apt.py
+++ b/lpbuildd/target/tests/test_apt.py
@@ -55,7 +55,9 @@ class TestOverrideSourcesList(TestCase):
                 ).encode("UTF-8"),
                 stat.S_IFREG | 0o644,
             ),
-            override_sources_list.backend.backend_fs["/etc/apt/sources.list"],
+            override_sources_list.backend.backend_fs[
+                "/etc/apt/sources.list.d/buildd.list"
+            ],
         )
         self.assertEqual(
             (b'Acquire::Retries "3";\n', stat.S_IFREG | 0o644),
@@ -113,7 +115,9 @@ class TestOverrideSourcesList(TestCase):
                 ).encode("UTF-8"),
                 stat.S_IFREG | 0o644,
             ),
-            override_sources_list.backend.backend_fs["/etc/apt/sources.list"],
+            override_sources_list.backend.backend_fs[
+                "/etc/apt/sources.list.d/buildd.list"
+            ],
         )
         self.assertEqual(
             (b'Acquire::Retries "3";\n', stat.S_IFREG | 0o644),