From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C200013829C for ; Tue, 31 May 2016 14:21:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9382F254027; Tue, 31 May 2016 14:21:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E70F254027 for ; Tue, 31 May 2016 14:21:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94619340C69 for ; Tue, 31 May 2016 14:21:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C439C95D for ; Tue, 31 May 2016 14:21:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1464704416.70376e296ccf04cd15c03db6fd7a8c83bf0cf09f.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/layman/, app-portage/layman/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch app-portage/layman/layman-2.4.1-r1.ebuild app-portage/layman/layman-2.4.1.ebuild X-VCS-Directories: app-portage/layman/ app-portage/layman/files/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 70376e296ccf04cd15c03db6fd7a8c83bf0cf09f X-VCS-Branch: master Date: Tue, 31 May 2016 14:21:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c83f1393-bdfb-4945-ab67-742d03687d64 X-Archives-Hash: 87dbe70fd11c1b7b3ca3fa203b39e852 commit: 70376e296ccf04cd15c03db6fd7a8c83bf0cf09f Author: Brian Dolbec gentoo org> AuthorDate: Tue May 31 14:19:21 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue May 31 14:20:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70376e29 app-portage/layman: Bump with patch, fixes bug 582154 Package-Manager: portage-2.3.0_rc1 .../layman-2.4.1-sourcefileattributechanges.patch | 42 ++++++++++++++++++++++ ...{layman-2.4.1.ebuild => layman-2.4.1-r1.ebuild} | 4 +++ 2 files changed, 46 insertions(+) diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch new file mode 100644 index 0000000..207f474 --- /dev/null +++ b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch @@ -0,0 +1,42 @@ +From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Tue, 10 May 2016 15:12:02 -0700 +Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied + 'sourcefile' attribute changes + +It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for +backward compatibility. +It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError. +The filepath of the affected file for the error message had an extra leading '_'. +Add the module name to the warning message. +--- + layman/module.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/layman/module.py b/layman/module.py +index 08bcbc2..092418f 100644 +--- a/layman/module.py ++++ b/layman/module.py +@@ -49,13 +49,14 @@ class Module(object): + kid = self.module_spec['provides'][submodule] + kidname = kid['name'] + try: ++ kid['module_name'] = '.'.join([mod_name, kid['sourcefile']]) ++ except KeyError: + kid['module_name'] = '.'.join([mod_name, kidname]) +- except ImportError: +- kid['module_name'] = '.'.join([mod_name, self.name]) +- f = self.__module.__file__ +- msg = 'Module.__initialize(); module spec is old, missing '\ ++ f = self._module.__file__ ++ msg = 'Module.__initialize(); %(module)s module spec is old, missing '\ + 'attribute: \'sourcefile\'.\nBackward compatibility '\ +- 'may be removed in the future.\nFile: %(f)s' % {'f': f} ++ 'may be removed in the future.\nFile: %(f)s' % { ++ 'module': self.name, 'f': f} + self.output.warn(msg) + kid['is_imported'] = False + self.kids[kidname] = kid +-- +2.8.3 + diff --git a/app-portage/layman/layman-2.4.1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild similarity index 96% rename from app-portage/layman/layman-2.4.1.ebuild rename to app-portage/layman/layman-2.4.1-r1.ebuild index 79dcd8c..748813b 100644 --- a/app-portage/layman/layman-2.4.1.ebuild +++ b/app-portage/layman/layman-2.4.1-r1.ebuild @@ -41,6 +41,10 @@ RDEPEND=" >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] " +PATCHES=( + "${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch" +) + layman_check_kernel_config() { local CONFIG_CHECK use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"