Release 2.2.2

docs/ahriman.models.rst

@@ -92,6 +92,14 @@ ahriman.models.package\_source module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.pkgbuild\_patch module
+-------------------------------------
+
+.. automodule:: ahriman.models.pkgbuild_patch
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.property module
 ------------------------------
 

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.1.0
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

src/ahriman/core/build_tools/sources.py

@@ -57,6 +57,8 @@ class Sources(LazyLogging):
             return
 
         architectures = Package.supported_architectures(sources_dir)
+        if "any" in architectures:  # makepkg does not like when there is any other arch except for any
+            return
         architectures.add(architecture)
         patch = PkgbuildPatch("arch", list(architectures))
         patch.write(pkgbuild_path)

src/ahriman/version.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.1.0"
+__version__ = "2.2.2"

tests/ahriman/core/build_tools/test_sources.py

@@ -23,6 +23,18 @@ def test_extend_architectures(mocker: MockerFixture) -> None:
     write_mock.assert_called_once_with(Path("local") / "PKGBUILD")
 
 
+def test_extend_architectures_any(mocker: MockerFixture) -> None:
+    """
+    must skip architecture patching in case if there is any architecture
+    """
+    mocker.patch("pathlib.Path.is_file", return_value=True)
+    mocker.patch("ahriman.models.package.Package.supported_architectures", return_value={"any"})
+    write_mock = mocker.patch("ahriman.models.pkgbuild_patch.PkgbuildPatch.write")
+
+    Sources.extend_architectures(Path("local"), "i686")
+    write_mock.assert_not_called()
+
+
 def test_extend_architectures_skip(mocker: MockerFixture) -> None:
     """
     must skip extending list of the architectures in case if no PKGBUILD file found