diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-07-08 13:26:24 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-07-08 13:26:24 -0700 |
| commit | dbdbb28755e61bddcb5b632518df6954a7bb0b00 (patch) | |
| tree | 4a522b3727e15adad7b18a52990ec9df7b52ae67 | |
| parent | Update version for a release (diff) | |
| download | catalyst-dbdbb28755e61bddcb5b632518df6954a7bb0b00.tar.gz catalyst-dbdbb28755e61bddcb5b632518df6954a7bb0b00.tar.bz2 catalyst-dbdbb28755e61bddcb5b632518df6954a7bb0b00.zip | |
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 <bluness@gentoo.org>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
| -rwxr-xr-x | targets/stage1/build.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/targets/stage1/build.py b/targets/stage1/build.py index bf20bcf3..8a8a3b1e 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+" ") |