From b2c3bfa6e1b005458f70043bc4d83746fe9a4ed3 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 5 Oct 2011 20:41:49 +0000 Subject: [PATCH] revision bump, add upstream patch Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- app-admin/packagekit-base/ChangeLog | 9 +- app-admin/packagekit-base/Manifest | 17 +--- ...se-entropy-add-forward-compatibility.patch | 94 +++++++++++++++++++ ...build => packagekit-base-0.6.18-r1.ebuild} | 3 +- 4 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 app-admin/packagekit-base/files/packagekit-base-entropy-add-forward-compatibility.patch rename app-admin/packagekit-base/{packagekit-base-0.6.18.ebuild => packagekit-base-0.6.18-r1.ebuild} (97%) diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog index 040d9b287724..995d2247ccd1 100644 --- a/app-admin/packagekit-base/ChangeLog +++ b/app-admin/packagekit-base/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/packagekit-base # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.6 2011/09/05 21:03:22 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.7 2011/10/05 20:41:49 lxnay Exp $ + +*packagekit-base-0.6.18-r1 (05 Oct 2011) + + 05 Oct 2011; Fabio Erculiani + -packagekit-base-0.6.18.ebuild, +packagekit-base-0.6.18-r1.ebuild, + +files/packagekit-base-entropy-add-forward-compatibility.patch: + revision bump, add upstream patch 05 Sep 2011; Fabio Erculiani packagekit-base-0.6.18.ebuild: diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest index 6dc6e9942655..b289bca22064 100644 --- a/app-admin/packagekit-base/Manifest +++ b/app-admin/packagekit-base/Manifest @@ -1,21 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX packagekit-base-0.6.17-entropy-extra-downloads-support.patch 1700 RMD160 c37400f3590fdaaad17a50850827dc7b08016af0 SHA1 1681081a791907b4a6f17faa2cc32aae51d1140e SHA256 224b0ef6ec87af14bac62e20f35264791891b72e17d11d15e2f4a9f323fbe266 +AUX packagekit-base-entropy-add-forward-compatibility.patch 3944 RMD160 1d7f51dd988ccef8787101e507bbbd2bb0169af7 SHA1 58301fd48e85fb732f6467f6a6bf4538f6f8d581 SHA256 6c4ef0734c35179d57367d762fbafc6cec22253fe91b8b00b679f20c8c23cc72 DIST PackageKit-0.6.16.tar.xz 7900928 RMD160 67a6b0cb37c1d58b8a63391c46ab2de9d84f90f2 SHA1 30ca0c4f9f945abdbeb237256254d32581f8e417 SHA256 28fc2149e2dac4bed5b6b0479488dacc8af7e8a18556851711502b26de567e67 DIST PackageKit-0.6.17.tar.xz 7890112 RMD160 2121081f2155324c592b3e3c7c8a5ac88c368bf3 SHA1 c538dd1a87eca8a1461dcb5839931bb23f792370 SHA256 7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3 DIST PackageKit-0.6.18.tar.xz 7890956 RMD160 221e8dfd5d826075ff30a25dea6d335fb755e2f5 SHA1 904cdf2156dfe7f350b7657fad1e69150243b277 SHA256 38e22db73360b50e4b495d03a8d7e44e1fd1525ac44fb4a3bbac99ad21779c32 EBUILD packagekit-base-0.6.16.ebuild 4880 RMD160 4d47b9ff47fc7b2e09cee6c14c2dfc6ab4facd76 SHA1 046c31a7b14060c547fa50b7968d7cd3f7746b12 SHA256 a4146d99dd599f83a811cb121ea76ccde69ba6d60c14515d1c5c87ce06f5f173 EBUILD packagekit-base-0.6.17-r1.ebuild 4973 RMD160 7b5c5562c63083e3be44b27fa4be5b4685d24878 SHA1 e5f2eb7eedb0d7470eee49fc7ccdc1f637549cf1 SHA256 2cf0e5c3a00d833a4edd8890f18ffdc8a3393f4caf169b7f6c6c15be6df13c0b -EBUILD packagekit-base-0.6.18.ebuild 5063 RMD160 4fe98fef7906e528930f86dc5694d6e56e56c9d2 SHA1 2accfe2c8596567ae2578c09c46ad555a2cb1352 SHA256 f49705956c55107f6be2d285fa2f2bd64bfcbf8bcf111c9ef7f5171baea18e93 -MISC ChangeLog 1185 RMD160 9877e350ccb615685e9304f85f07401973918bd2 SHA1 1c0ea03defd266669f5fccd28551a55d7e64e246 SHA256 16a63a16004009a52cc0364dcc94b105370f6b1ee069500438958329b97b2195 +EBUILD packagekit-base-0.6.18-r1.ebuild 5134 RMD160 326631f0679f7e07061873b5fee0b63b6732faad SHA1 cdc94cf16150e4d86d3b27f8c08a404bf1fa4bf1 SHA256 7fc7920dc6241889ed2d7a11b66d9cdee70b5dd3842e0c00a7f4b029d2ad9ac4 +MISC ChangeLog 1449 RMD160 1d8fec8f4bde3806852f7c4a136af428e3b34a41 SHA1 a3b4f0a18c59ff68eebf9084edbc4f92ad9c50bd SHA256 e9b53e03ec48fcc2e7a5f8e1445f517e34289beca53aaf1ac56bb56de10b6d34 MISC metadata.xml 763 RMD160 b680b38a617f54033205bc048adefcbf13aa6887 SHA1 da1a37c2d77ea754fd52efc9537e215118a027a3 SHA256 1c382b6cb0a3c214688642037c1021a7f45c556edbf4631e02f1923e49b371ba ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iJwEAQEIAAYFAk589RQACgkQfXuS5UK5QB3sqgP+NcoUpgvf6l4nXiK4QQKbt3zt -53lHevtDOtItxRJgG4hREOeIZT4Oo8KDwpbjyN8B0MNjwA824qAzIAXoWG6DSB8k -IHYbfMhzixUiahqMYo4FtYwaehuAPQWT4Uyk8GHBWyUfr2RYbj3ucKzURH6lvy34 -QMLFI7PvNp+cPiyJyQ4= -=diBI ------END PGP SIGNATURE----- diff --git a/app-admin/packagekit-base/files/packagekit-base-entropy-add-forward-compatibility.patch b/app-admin/packagekit-base/files/packagekit-base-entropy-add-forward-compatibility.patch new file mode 100644 index 000000000000..354fca6fbcbc --- /dev/null +++ b/app-admin/packagekit-base/files/packagekit-base-entropy-add-forward-compatibility.patch @@ -0,0 +1,94 @@ +commit d8c13d8c3e875bf1d87650646cb960a87468ba87 +Author: Fabio Erculiani +Date: Wed Oct 5 22:39:30 2011 +0200 + + entropy: add forward compatibility with upcoming API changes + +diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py +index fe8c609..0c82039 100755 +--- a/backends/entropy/entropyBackend.py ++++ b/backends/entropy/entropyBackend.py +@@ -64,7 +64,8 @@ from entropy.client.interfaces import Client + from entropy.core.settings.base import SystemSettings + from entropy.misc import LogFile + from entropy.cache import EntropyCacher +-from entropy.exceptions import SystemDatabaseError ++from entropy.exceptions import SystemDatabaseError, DependenciesNotFound, \ ++ DependenciesCollision + from entropy.db.exceptions import Error as EntropyRepositoryError + try: + from entropy.exceptions import DependenciesNotRemovable +@@ -589,18 +590,32 @@ class PackageKitEntropyMixin(object): + if calculate_deps: + self.status(STATUS_DEP_RESOLVE) + empty_deps, deep_deps = False, False +- run_queue, removal_queue, status = self._entropy.get_install_queue( +- matches, empty_deps, deep_deps) ++ try: ++ queue_obj = self._entropy.get_install_queue( ++ matches, empty_deps, deep_deps) ++ if len(queue_obj) == 2: ++ # new api ++ run_queue, removal_queue = queue_obj ++ else: ++ # old api ++ run_queue, removal_queue, status = queue_obj ++ if status == -2: ++ raise DependenciesNotFound(run_queue) ++ elif status == -3: ++ raise DependenciesCollision(run_queue) ++ except DependenciesNotFound as exc: ++ self.error(ERROR_DEP_RESOLUTION_FAILED, ++ "Cannot find the following dependencies: %s" % ( ++ ', '.join(sorted(exc.value)),)) ++ return ++ except DependenciesCollision: ++ self.error(ERROR_DEP_RESOLUTION_FAILED, ++ "Dependencies collisions, cannot continue") ++ return ++ + else: + run_queue = matches + removal_queue = [] +- status = 0 +- +- if status == -2: +- self.error(ERROR_DEP_RESOLUTION_FAILED, +- "Cannot find the following dependencies: %s" % ( +- ', '.join(run_queue),)) +- return + + self.percentage(0) + self.status(STATUS_DOWNLOAD) +@@ -934,12 +949,26 @@ class PackageKitEntropyBackend(PackageKitBaseBackend, PackageKitEntropyMixin): + + empty = False + deep = False +- install, removal, deps_not_f = self._entropy.get_install_queue(matches, +- empty, deep, recursive = recursive) +- +- if deps_not_f == -2: ++ try: ++ queue_obj = self._entropy.get_install_queue(matches, ++ empty, deep, recursive = recursive) ++ if len(queue_obj) == 2: ++ # new api ++ install, removal = queue_obj ++ else: ++ # old api ++ install, removal, status = queue_obj ++ if status == -2: ++ raise DependenciesNotFound(install) ++ elif status == -3: ++ raise DependenciesCollision(install) ++ except DependenciesNotFound as exc: ++ self.error(ERROR_DEP_RESOLUTION_FAILED, ++ "Dependencies not found: %s" % (sorted(exc.value),)) ++ return ++ except DependenciesCollision: + self.error(ERROR_DEP_RESOLUTION_FAILED, +- "Dependencies not found: %s" % (sorted(install),)) ++ "Dependencies collisions, cannot continue") + return + + # transform install into (repo, pkg_id, c_repo) list diff --git a/app-admin/packagekit-base/packagekit-base-0.6.18.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.18-r1.ebuild similarity index 97% rename from app-admin/packagekit-base/packagekit-base-0.6.18.ebuild rename to app-admin/packagekit-base/packagekit-base-0.6.18-r1.ebuild index 3dda846ee4c9..0f6f223b58cc 100644 --- a/app-admin/packagekit-base/packagekit-base-0.6.18.ebuild +++ b/app-admin/packagekit-base/packagekit-base-0.6.18-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.18.ebuild,v 1.3 2011/09/05 21:03:22 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.18-r1.ebuild,v 1.1 2011/10/05 20:41:49 lxnay Exp $ EAPI="3" @@ -69,6 +69,7 @@ RESTRICT="test" # tests are failing atm src_prepare() { epatch "${FILESDIR}/${PN}-0.6.17-entropy-extra-downloads-support.patch" + epatch "${FILESDIR}/${PN}-entropy-add-forward-compatibility.patch" } src_configure() { -- 2.26.2