[Piuparts-devel] [Git][debian/piuparts][develop] piuparts.py, tests and docs: handle new "non-free-firmware" section in Debian. Closes: #1028661.

[Holger Levsen (@holger)]

Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
402a97af by Holger Levsen at 2023-01-18T20:58:09+01:00
piuparts.py, tests and docs: handle new "non-free-firmware" section in Debian. Closes: #1028661.

(Strictly speaking this is only used for bookworm, unstable, experimental and
 later suites like trixie, but specifying which suite has which sections is
 out of scope for piuparts itself.)

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

- docs/README_server.txt
- docs/piuparts/piuparts.1.txt
- piuparts.py
- tests/test_piuparts.py


Changes:

=====================================
docs/README_server.txt
=====================================
@@ -480,7 +480,7 @@ section, too, and will serve as defaults for all other sections
  * "area" is the archive area used to get the list of packages to
  be tested. The Packages file for this area will be loaded. The
  default is "main" and the possible values depend on the vendor,
- for Debian these are main, contrib, non-free.
+ for Debian these are main, contrib, non-free and non-free-firmware.
 
  * "components" sets the archive areas that will be available when
  testing the packages selected via the "area" setting. These will


=====================================
docs/piuparts/piuparts.1.txt
=====================================
@@ -3,7 +3,7 @@
  piuparts(1)
  ===========
  :doctype: manpage
- :revdate: 2017-03-06
+ :revdate: 2023-01-18
 
 
 
@@ -189,7 +189,7 @@ Options must come before the other command line arguments.
 *-m* 'url', *-*-mirror*='url'::
   Which Debian mirror to use. The default is the first mirror named in */etc/apt/sources.list* or *http://deb.debian.org/debian* if none is found. This option may be used multiple times to use multiple mirrors. Only the first mirror is used with *debootstrap*.
 
-  The 'components' that are used for a mirror can also be set with this option: a space separated list within the same argument (so you need to quote the entire argument in the shell). If no components are given explicitly, the usual Debian components are used (main, contrib, and non-free). For the mirrors read from */etc/apt/sources.list*, the components are read from the same place.
+  The 'components' that are used for a mirror can also be set with this option: a space separated list within the same argument (so you need to quote the entire argument in the shell). If no components are given explicitly, the usual Debian components are used (main, contrib, non-free and non-free-firmware). For the mirrors read from */etc/apt/sources.list*, the components are read from the same place.
 
  Note that file: addresses works if the directories are made accessible from within the chroot with '--bindmount'.
 


=====================================
piuparts.py
=====================================
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2007-2018 Holger Levsen (holger at layer-acht.org)
+# Copyright © 2007-2023 Holger Levsen (holger at layer-acht.org)
 # Copyright © 2010-2019 Andreas Beckmann (anbe at debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ class Defaults:
 class DebianDefaults(Defaults):
 
     def get_components(self):
-        return ["main", "contrib", "non-free"]
+        return ["main", "contrib", "non-free", "non-free-firmware"]
 
     def get_mirror(self):
         return [("http://deb.debian.org/debian", self.get_components())]


=====================================
tests/test_piuparts.py
=====================================
@@ -23,10 +23,10 @@ class DefaultsFactoryTests(unittest.TestCase):
         self.assertEqual(
             defaults.get_keyring(), "/usr/share/keyrings/debian-archive-keyring.gpg"
         )
-        self.assertEqual(defaults.get_components(), ["main", "contrib", "non-free"])
+        self.assertEqual(defaults.get_components(), ["main", "contrib", "non-free", "non-free-firmware"])
         self.assertEqual(
             defaults.get_mirror(),
-            [("http://deb.debian.org/debian", ["main", "contrib", "non-free"])],
+            [("http://deb.debian.org/debian", ["main", "contrib", "non-free", "non-free-firmware"])],
         )
         self.assertEqual(defaults.get_distribution(), ["sid"])
 



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/commit/402a97aff55e9602a1a47dc29bbbffa0e96b37c5

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/commit/402a97aff55e9602a1a47dc29bbbffa0e96b37c5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20230118/49334dbf/attachment-0001.htm>