gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

dev-python/html2text: fix file conflicts due to unapplied sed

Browse Source 
```
 * SED: the following did not cause any changes
 *     sed -e 's/html2text = html2text.cli:main/py\0/' -i setup.cfg || die;
 * no-op: -e s/html2text = html2text.cli:main/py\0/
```

And on merge:

```
 * Detected file collision(s):
 *
 * 	/usr/bin/html2text
 *
 * Searching all installed packages for file collisions...
 *
 * Press Ctrl-C to Stop
 *
 * app-text/html2text-2.2.3:0::gentoo
 * 	/usr/bin/html2text
 *
 * Package 'dev-python/html2text-2025.4.15' NOT merged due to file
 * collisions. If necessary, refer to your elog messages for the whole
 * content of the above message.
```

Regression in commit 989f1d35a84d9755eced0c36e4bdd99ef992e6b9 which
bumped to a version that ported the upstream build system to use
pyproject.toml. Same information, different file.

Fixes: 989f1d35a84d9755eced0c36e4bdd99ef992e6b9
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
This commit is contained in:
Eli Schwartz 2025-05-04 18:32:09 -04:00
parent de3908baf2
commit 51f180d4ad
No known key found for this signature in database
GPG Key ID: 84A7D12B700D2F57
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-python/html2text/html2text-2025.4.15.ebuild → dev-python/html2text/html2text-2025.4.15-r1.ebuild
View File

@ -28,6 +28,6 @@ distutils_enable_tests pytest
src_prepare() {
# naming conflict with app-text/html2text, bug 421647
sed -e 's/html2text = html2text.cli:main/py\0/' -i setup.cfg || die
sed -e 's/html2text = "html2text.cli:main"/py\0/' -i pyproject.toml || die
distutils-r1_src_prepare
}