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 AD94E13855D for ; Sat, 19 Jan 2013 06:40:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A274D21C001; Sat, 19 Jan 2013 06:40:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 302A621C001 for ; Sat, 19 Jan 2013 06:40:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B01233D841 for ; Sat, 19 Jan 2013 06:40:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A4C5BE4073 for ; Sat, 19 Jan 2013 06:40:27 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1358577611.5ffdeee2e2cc7738cc4d9280d8758addf463c560.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/glsa-check X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5ffdeee2e2cc7738cc4d9280d8758addf463c560 X-VCS-Branch: master Date: Sat, 19 Jan 2013 06:40:27 +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: 2cf21b5d-59f6-472b-bd9d-ecd4ce9f3e30 X-Archives-Hash: 4f43068261be5fa73b6c30c6aa76c3e5 commit: 5ffdeee2e2cc7738cc4d9280d8758addf463c560 Author: Zac Medico gentoo org> AuthorDate: Sat Jan 19 06:40:11 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jan 19 06:40:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5ffdeee2 glsa-check: explicit imports, fix glsaconfig ref --- bin/glsa-check | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/glsa-check b/bin/glsa-check index b2da90a..f1aef04 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -13,7 +13,7 @@ sys.path.insert(0, pym_path) import portage portage._internal_caller = True from portage import os -from portage.output import * +from portage.output import green, red, nocolor, white from optparse import OptionGroup, OptionParser @@ -100,7 +100,8 @@ elif mode == "list" and not params: params.append("new") # delay this for speed increase -from portage.glsa import * +from portage.glsa import (Glsa, GlsaTypeException, GlsaFormatException, + get_applied_glsas, get_glsa_list) eroot = portage.settings['EROOT'] vardb = portage.db[eroot]["vartree"].dbapi @@ -225,7 +226,7 @@ if mode in ["dump", "fix", "inject", "pretend"]: # using emerge for the actual merging as it contains the dependency # code and we want to be consistent in behaviour. Also this functionality # will be integrated in emerge later, so it shouldn't hurt much. - emergecmd = "emerge --oneshot " + glsaconfig["EMERGE_OPTS"] + " =" + pkg + emergecmd = "emerge --oneshot " + " =" + pkg if verbose: sys.stderr.write(emergecmd+"\n") exitcode = os.system(emergecmd)