From 2dc99538d2607adebe63f3a75f14f2a22f36da1c Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sat, 30 Jan 2021 16:02:59 +0100 Subject: [PATCH] rpm: Fix tags in rpm spec files Patches are named similar to sources, counting from 0. https://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s03s04.html --- tests/20_test_rpm.py | 4 ++-- tests/data/rpm/specs/gbp-test-tags.spec | 2 +- tests/data/rpm/specs/gbp-test-updates.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/20_test_rpm.py b/tests/20_test_rpm.py index a2cd5e01..c261c452 100644 --- a/tests/20_test_rpm.py +++ b/tests/20_test_rpm.py @@ -231,7 +231,7 @@ class TestSpecFile(RpmTestBase): spec.protected('_delete_tag')('source', 0) eq_(spec.sources(), {}) spec.protected('_delete_tag')('patch', 0) - spec.protected('_delete_tag')('patch', -1) + spec.protected('_delete_tag')('patch', 1) eq_(spec.protected('_patches')(), {}) prev = spec.protected('_delete_tag')('invalidtag', None) @@ -314,7 +314,7 @@ class TestSpecFile(RpmTestBase): for patch in spec.protected('_tags')['patch']['lines']: patches[patch['num']] = patch['linevalue'] - eq_(patches, {0: 'my_patch0', -1: 'my_patch'}) + eq_(patches, {0: 'my_patch0', 1: 'my_patch'}) def test_patch_series(self): """Test the getting the patches as a patchseries""" diff --git a/tests/data/rpm/specs/gbp-test-tags.spec b/tests/data/rpm/specs/gbp-test-tags.spec index d0f2e9e3..19efe9f0 100644 --- a/tests/data/rpm/specs/gbp-test-tags.spec +++ b/tests/data/rpm/specs/gbp-test-tags.spec @@ -33,7 +33,7 @@ Packager: my_packager Url: my_url Vcs: my_vcs Source: my_source -Patch: my_%patch_fn_base +Patch1: my_%patch_fn_base Patch0: my_%{patch_fn_base}0 Nosource: 0 Nopatch: 0 diff --git a/tests/data/rpm/specs/gbp-test-updates.spec b/tests/data/rpm/specs/gbp-test-updates.spec index e68f4b2d..30ccb30d 100644 --- a/tests/data/rpm/specs/gbp-test-updates.spec +++ b/tests/data/rpm/specs/gbp-test-updates.spec @@ -17,7 +17,7 @@ Packager: my_packager Url: my_url Vcs: my_vcs Source: my_source -Patch: my_%patch_fn_base +Patch1: my_%patch_fn_base Patch0: my_%{patch_fn_base}0 Nosource: 0 Nopatch: 0 -- 2.34.1