commit: 9ba869dfdf7f44abbbc3f77e4f7b86b1e3aa465e Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Fri Mar 21 12:31:27 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Mar 21 14:02:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba869df
sys-boot/woeusb-ng: fix syntax warning in Python 3.12 https://github.com/WoeUSB/WoeUSB-ng/pull/134 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/41211 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch | 16 ++++++++++++++++ sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild | 1 + 2 files changed, 17 insertions(+) diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch new file mode 100644 index 000000000000..dfda16cdb417 --- /dev/null +++ b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch @@ -0,0 +1,16 @@ +https://github.com/WoeUSB/WoeUSB-ng/pull/134 +Fix invalid escape sequence +\. is not a valid escape sequence since Python 3.12 and generates a warning. +It will become an error in a future version. +https://docs.python.org/3.12/whatsnew/3.12.html#other-language-changes +--- a/WoeUSB/workaround.py ++++ b/WoeUSB/workaround.py +@@ -52,7 +52,7 @@ def support_windows_7_uefi_boot(source_fs_mountpoint, target_fs_mountpoint): + :param target_fs_mountpoint: + :return: + """ +- grep = subprocess.run(["grep", "--extended-regexp", "--quiet", "^MinServer=7[0-9]{3}\.[0-9]", ++ grep = subprocess.run(["grep", "--extended-regexp", "--quiet", r"^MinServer=7[0-9]{3}\.[0-9]", + source_fs_mountpoint + "/sources/cversion.ini"], + stdout=subprocess.PIPE).stdout.decode("utf-8").strip() + if grep == "" and not os.path.isfile(source_fs_mountpoint + "/bootmgr.efi"): diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild index 8e3fe806b529..c69498f1ff1a 100644 --- a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild +++ b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild @@ -36,6 +36,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${P}-fix-pkg-discovery.patch + "${FILESDIR}"/${P}-python3.12.patch "${FILESDIR}"/${P}-skip-postinstall.patch )
