PR#9: Update rawhide to upstream release 51.11 - rpms/bottles

rpms / bottles

#9 Update rawhide to upstream release 51.11

Merged 2 months ago by gui1ty. Opened 3 months ago by packit.

rpms/ packit/bottles 51.11-rawhide-update-pull_from_upstream into rawhide

Catch AttributeError in set_manager()

Sandro • 2 months ago

37d5da1

Make sure Paths.bottles exists

Sandro • 2 months ago

e95581f

[packit] 51.11 upstream release

Packit • 3 months ago

31eb880

.gitignore

file modified

		`@@ -60,3 +60,4 @@`
		`/Bottles-51.6.tar.gz`
		`/Bottles-51.9.tar.gz`
		`/Bottles-51.10.tar.gz`
		`+ /Bottles-51.11.tar.gz`

README.packit

file added

		`@@ -0,0 +1,3 @@`
		`+ This repository is maintained by packit.`
		`+ https://packit.dev/`
		`+ The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25.`

bottles.spec

file modified

+5 -1

		`@@ -2,7 +2,7 @@`

		`Name: bottles`
		`Epoch: 1`
		`- Version: 51.10`
		`+ Version: 51.11`
		`Release: %autorelease`
		`Summary: Run Windows in a Bottle`

		`@@ -15,6 +15,10 @@`
		`License: GPL-3.0-or-later AND MIT`
		`URL: %{forgeurl}`
		`Source0: %{forgesource}`
		`+ # Make sure bottles dir exists when opening executable directly`
		`+ Patch: ensure_bottles_dir_exists.patch`
		`+ # Don't fail on AttributeError`
		`+ Patch: catch_exception_in_set_manager.patch`

		`BuildArch: noarch`
		`# blueprint-compiler does not work on s390x:`

catch_exception_in_set_manager.patch

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ commit 3e1db3c75fee5eedb2190e7dba71239e923affb7`
		`+ Author: Sandro <devel@penguinpee.nl>`
		`+ Date: Mon Mar 4 21:45:51 2024 +0100`
		`+`
		`+ Catch AttributeError in set_manager()`
		`+`
		`+ Return empty list if AttributeError is raised.`
		`+`
		`+ diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py`
		`+ index 5fb9a15c..cd26408b 100644`
		`+ --- a/bottles/frontend/windows/main_window.py`
		`+ +++ b/bottles/frontend/windows/main_window.py`
		`+ @@ -178,9 +178,12 @@ class MainWindow(Adw.ApplicationWindow):`
		`+ def set_manager(result: Manager, error=None):`
		`+ self.manager = result`
		`+`
		`+ - tmp_runners = [`
		`+ - x for x in self.manager.runners_available if not x.startswith("sys-")`
		`+ - ]`
		`+ + try:`
		`+ + tmp_runners = [`
		`+ + x for x in self.manager.runners_available if not x.startswith("sys-")`
		`+ + ]`
		`+ + except AttributeError:`
		`+ + tmp_runners = []`
		`+ if len(tmp_runners) == 0:`
		`+ self.show_onboard_view()`
		`+`

ensure_bottles_dir_exists.patch

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ commit 7eed7bbfa5d1da924b4c4e0659f0bf86b0fd7d7b`
		`+ Author: Sandro <devel@penguinpee.nl>`
		`+ Date: Mon Mar 4 20:28:49 2024 +0100`
		`+`
		`+ Make sure Paths.bottles exists`
		`+`
		+ When calling `bottles foo.exe` either from the command line or by
		`+ opening the executable from the file browser with Bottles, Bottles will`
		`+ throw a FileNotFoundError if Paths.bottles does not exist.`
		`+`
		`+ It seems check_app_dirs() is never called in that situation.`
		`+`
		`+ diff --git a/bottles/backend/managers/manager.py b/bottles/backend/managers/manager.py`
		`+ index 01b0039e..9d8ef000 100644`
		`+ --- a/bottles/backend/managers/manager.py`
		`+ +++ b/bottles/backend/managers/manager.py`
		`+ @@ -811,7 +811,11 @@ class Manager(metaclass=Singleton):`
		`+ Check for local bottles and update the local_bottles list.`
		`+ Will also mark the broken ones if the configuration file is missing`
		`+ """`
		`+ - bottles = os.listdir(Paths.bottles)`
		`+ + try:`
		`+ + bottles = os.listdir(Paths.bottles)`
		`+ + except FileNotFoundError:`
		`+ + self.check_app_dirs()`
		`+ + bottles = []`
		`+`
		`+ # Empty local bottles`
		`+ self.local_bottles = {}`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (Bottles-51.10.tar.gz) = a5d27f70d580cc115f797370437a41a0eeb7335e8278618415f7ba7268aae8102ba9ee8417723a731f677b7bf346773e5851f9021ff12bdec4305b436e589c24`
		`+ SHA512 (Bottles-51.11.tar.gz) = 42c503a4910a8e6c408caecd723edf1405aa034558d61313937a69c7d5ffb20ba4675fc9022775491cbbe6ba4a35ffac508b4721f9c971c57cbcb888345d546b`

packit commented 3 months ago

Upstream tag: 51.11
Upstream commit: 89abf684
Release monitoring project: 155688
Resolves rhbz#2264828

If you need to do any change in this pull request, you can clone Packit's fork and push directly to the source branch of this PR (provided you have commit access to this repository):

git clone ssh://$YOUR_USER@pkgs.fedoraproject.org/forks/packit/rpms/bottles.git
cd bottles
git checkout 51.11-rawhide-update-pull_from_upstream
git push origin 51.11-rawhide-update-pull_from_upstream

Alternatively, if you already have the package repository cloned, you can just fetch the Packit's fork:

cd bottles
git remote add packit ssh://$YOUR_USER@pkgs.fedoraproject.org/forks/packit/rpms/bottles.git
git fetch packit refs/heads/51.11-rawhide-update-pull_from_upstream
git checkout 51.11-rawhide-update-pull_from_upstream
git push packit 51.11-rawhide-update-pull_from_upstream

If you have the koji_build job configured as well, make sure to configure the allowed_pr_authors and/or allowed_committers (see the docs) since by default, Packit reacts only to its own PRs.

Before pushing builds/updates, please remember to check the new version against the packaging guidelines.

For example, please:

check that the new sources only contain permissible content
check that the license of the new version has not changed
check for any API/ABI and other changes that may break dependent packages
check the autogenerated changelog

:warning: Changed behaviour of loading the Packit configuration for koji_build and bodhi_update jobs

We would like to bring to your attention a recent update regarding the loading of Packit configuration for koji_build and bodhi_update jobs. Going forward, the configuration for these jobs will be loaded from the default repository branch (rawhide) instead of the respective branches. This aligns with the behavior of the pull_from_upstream job. We believe this adjustment will simplify the onboarding process and enhance the overall user experience.