| 1 |
commit: 24b83c988f5e24127dfab2c9430618ddb16d7e24 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 04:41:44 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 04:41:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b83c98 |
| 7 |
|
| 8 |
dev-python/python-debian: disable apt_pkg by default |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
...-apt-pkg.patch => 0.1.36-disable-apt-pkg.patch} | 29 +++++++++++++++++++--- |
| 14 |
.../python-debian/python-debian-0.1.36.ebuild | 2 +- |
| 15 |
2 files changed, 27 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch |
| 18 |
similarity index 77% |
| 19 |
rename from dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch |
| 20 |
rename to dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch |
| 21 |
index 64b040852b7..b497986b6da 100644 |
| 22 |
--- a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch |
| 23 |
+++ b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch |
| 24 |
@@ -1,12 +1,35 @@ |
| 25 |
-From 0b4e4e02e62ab6069e855fc44fec1cbfba3e2f2a Mon Sep 17 00:00:00 2001 |
| 26 |
+From 76b7c4e7d16e8f792323f8d14ebdb1678d9d12b0 Mon Sep 17 00:00:00 2001 |
| 27 |
From: Mike Gilbert <floppym@g.o> |
| 28 |
Date: Sat, 30 Nov 2019 23:18:05 -0500 |
| 29 |
-Subject: [PATCH] Remove tests that rely on apt_pkg |
| 30 |
+Subject: [PATCH] Disable apt_pkg support |
| 31 |
|
| 32 |
--- |
| 33 |
+ lib/debian/deb822.py | 4 +-- |
| 34 |
lib/debian/tests/test_deb822.py | 53 --------------------------------- |
| 35 |
- 1 file changed, 53 deletions(-) |
| 36 |
+ 2 files changed, 2 insertions(+), 55 deletions(-) |
| 37 |
|
| 38 |
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py |
| 39 |
+index c679f4b..2e85956 100644 |
| 40 |
+--- a/lib/debian/deb822.py |
| 41 |
++++ b/lib/debian/deb822.py |
| 42 |
+@@ -1913,7 +1913,7 @@ class Sources(Dsc, _PkgRelationMixin): |
| 43 |
+ def iter_paragraphs(cls, |
| 44 |
+ sequence, # type: IterableInputDataType |
| 45 |
+ fields=None, # type: Optional[List[str]] |
| 46 |
+- use_apt_pkg=True, # type: bool |
| 47 |
++ use_apt_pkg=False, # type: bool |
| 48 |
+ shared_storage=False, # type: bool |
| 49 |
+ encoding="utf-8", # type: str |
| 50 |
+ strict=None, # type: Optional[Dict] |
| 51 |
+@@ -1955,7 +1955,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin): |
| 52 |
+ def iter_paragraphs(cls, |
| 53 |
+ sequence, # type: IterableInputDataType |
| 54 |
+ fields=None, # type: Optional[List[str]] |
| 55 |
+- use_apt_pkg=True, # type: bool |
| 56 |
++ use_apt_pkg=False, # type: bool |
| 57 |
+ shared_storage=False, # type: bool |
| 58 |
+ encoding="utf-8", # type: str |
| 59 |
+ strict=None, # type: Optional[Dict] |
| 60 |
diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py |
| 61 |
index 7101727..64a724c 100755 |
| 62 |
--- a/lib/debian/tests/test_deb822.py |
| 63 |
|
| 64 |
diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild |
| 65 |
index 49012658cf5..eb6ee829a2e 100644 |
| 66 |
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild |
| 67 |
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild |
| 68 |
@@ -29,7 +29,7 @@ BDEPEND="${RDEPEND} |
| 69 |
) |
| 70 |
" |
| 71 |
|
| 72 |
-PATCHES=( "${FILESDIR}/0.1.36-test-no-apt-pkg.patch" ) |
| 73 |
+PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" ) |
| 74 |
|
| 75 |
python_compile_all() { |
| 76 |
${EPYTHON} lib/debian/doc-debtags > README.debtags || die |
Archives