Merge pull request #1638 from Pairman/main

freakboy3742 · web-flow · commit 3849c1c9fa39 · 2024-02-09T08:47:39.000+08:00
Fix typo in rpm-build package name
diff --git a/changes/1638.bugfix.rst b/changes/1638.bugfix.rst
@@ -0,0 +1 @@
+When Briefcase can't find ``rpmbuild` on an RPM-based system, the message giving install instructions now uses the correct package name.
diff --git a/src/briefcase/platforms/linux/system.py b/src/briefcase/platforms/linux/system.py
@@ -852,7 +852,7 @@ def _verify_packaging_tools(self, app: AppConfig):
         """Verify that the local environment contains the packaging tools."""
         tool_name, executable_name, package_name = {
             "deb": ("dpkg", "dpkg-deb", "dpkg-dev"),
-            "rpm": ("rpm-build", "rpmbuild", "rpmbuild"),
+            "rpm": ("rpm-build", "rpmbuild", "rpm-build"),
             "pkg": ("makepkg", "makepkg", "pacman"),
         }[app.packaging_format]
 
diff --git a/tests/platforms/linux/system/test_package__rpm.py b/tests/platforms/linux/system/test_package__rpm.py
@@ -99,7 +99,7 @@ def test_verify_no_docker(monkeypatch, package_command, first_app_rpm):
     [
         (
             "rhel",
-            "Can't find the rpm-build tools. Try running `sudo dnf install rpmbuild`.",
+            "Can't find the rpm-build tools. Try running `sudo dnf install rpm-build`.",
         ),
         (None, "Can't find the rpmbuild tool. Install this first to package the rpm."),
     ],

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+When Briefcase can't find ``rpmbuild` on an RPM-based system, the message giving install instructions now uses the correct package name.
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ def test_verify_no_docker(monkeypatch, package_command, first_app_rpm):`
`99`	`99`	`[`
`100`	`100`	`(`
`101`	`101`	`"rhel",`
`102`		- "Can't find the rpm-build tools. Try running `sudo dnf install rpmbuild`.",
	`102`	+ "Can't find the rpm-build tools. Try running `sudo dnf install rpm-build`.",
`103`	`103`	`),`
`104`	`104`	`(None, "Can't find the rpmbuild tool. Install this first to package the rpm."),`
`105`	`105`	`],`