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 E4713138D0F for ; Wed, 8 Jul 2015 20:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94496E0850; Wed, 8 Jul 2015 20:33:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3527FE0850 for ; Wed, 8 Jul 2015 20:33:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81369340854 for ; Wed, 8 Jul 2015 20:32:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 472F275B for ; Wed, 8 Jul 2015 20:33:01 +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: <1436387184.dbdbb28755e61bddcb5b632518df6954a7bb0b00.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/build.py X-VCS-Directories: targets/stage1/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: dbdbb28755e61bddcb5b632518df6954a7bb0b00 X-VCS-Branch: 2.X Date: Wed, 8 Jul 2015 20:33:01 +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: 90c74045-52c4-4de9-af3b-ea97b0d547eb X-Archives-Hash: b151091d4843b74aad800881330c0405 commit: dbdbb28755e61bddcb5b632518df6954a7bb0b00 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jul 8 20:26:24 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Jul 8 20:26:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dbdbb287 targets/stage1/build.py: Fix bug 554154 portage.dep_getkey(pkgs[idx]) This always throws and exception because of the leading '*' making the purpose of the entire loop from 28-35 useless. X-Gentoo-Bug: 554154 X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=554154 X-Gentoo-Reporter: Anthony Basile gentoo.org> Signed-off-by: Brian Dolbec gentoo.org> targets/stage1/build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/stage1/build.py b/targets/stage1/build.py index bf20bcf..8a8a3b1 100755 --- a/targets/stage1/build.py +++ b/targets/stage1/build.py @@ -26,11 +26,11 @@ buildpkgs = scan_profile("packages.build") # system profile (it may have <,>,=,etc... operators # and version numbers) for idx in range(0, len(pkgs)): + pkg = pkgs[idx].lstrip('*') try: - bidx = buildpkgs.index(portage.dep_getkey(pkgs[idx])) - buildpkgs[bidx] = pkgs[idx] - if buildpkgs[bidx][0:1] == "*": - buildpkgs[bidx] = buildpkgs[bidx][1:] - except: pass + bidx = buildpkgs.index(portage.dep_getkey(pkg)) + buildpkgs[bidx] = pkg + except: + pass for b in buildpkgs: sys.stdout.write(b+" ")