fuzzyray 14/03/19 18:29:03 Added: 0.3.0.9-revdep-rebuild-py-504654-1.patch 0.3.0.9-revdep-rebuild-py-504654-2.patch Log: Revision bump to fix issues with revdep-rebuild.py (Bug 504654). Fix portage dependency and add dependency on sys-apps/gentoo-functions. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xDCB4A7FF)
Revision Changes Path 1.1 app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-1.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-1.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-1.patch?rev=1.1&content-type=text/plain Index: 0.3.0.9-revdep-rebuild-py-504654-1.patch =================================================================== >From c5baf551987e2fb412caa396ae34f7f4341ad819 Mon Sep 17 00:00:00 2001 From: slis <lis.sla...@gmail.com> Date: Mon, 17 Mar 2014 07:42:01 +0100 Subject: [PATCH 1/2] Fix #504654 - problem with encoding for non-ascii filenames --- pym/gentoolkit/revdep_rebuild/stuff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py index cc3da7b..7a8373d 100644 --- a/pym/gentoolkit/revdep_rebuild/stuff.py +++ b/pym/gentoolkit/revdep_rebuild/stuff.py @@ -22,7 +22,7 @@ def call_program(args): subp = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = subp.communicate() stdout = stdout.decode('utf-8') - return str(stdout) + return stdout def scan(params, files, max_args, logger): -- 1.9.1 1.1 app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-py-504654-2.patch?rev=1.1&content-type=text/plain Index: 0.3.0.9-revdep-rebuild-py-504654-2.patch =================================================================== >From ae20dbd7f2ef2810d3150e870ece6f5b7278f676 Mon Sep 17 00:00:00 2001 From: slis <lis.sla...@gmail.com> Date: Mon, 17 Mar 2014 07:48:19 +0100 Subject: [PATCH 2/2] Fix for non-existing libraries version (https://bugs.gentoo.org/show_bug.cgi?id=504654#c5) --- pym/gentoolkit/revdep_rebuild/analyse.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index d7b210b..bd1b6b7 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -185,7 +185,11 @@ class LibCheck(object): scanned_files = self.scanned_files found_libs = {} for bits in self.searchbits: - scanned = scanned_files[bits] + try: + scanned = scanned_files[bits] + except KeyError: + self.logger.debug('There are no %s-bit libraries'%bits) + continue self.logger.debug(self.smsg % bits) self.setlibs(sorted(scanned), bits) for soname, filepaths in scanned.items(): -- 1.9.1