From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pomhy-0006KB-Ty for garchives@archives.gentoo.org; Mon, 14 Feb 2011 00:54:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AE49E09C7; Mon, 14 Feb 2011 00:54:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4BD67E09B6 for ; Mon, 14 Feb 2011 00:54:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B5181B40C8 for ; Mon, 14 Feb 2011 00:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E921880075 for ; Mon, 14 Feb 2011 00:54:12 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <503c1586ac80109089f0bf6d0a1a0a579a19a6d7.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:overlord_merge commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/config.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 503c1586ac80109089f0bf6d0a1a0a579a19a6d7 Date: Mon, 14 Feb 2011 00:54:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f836501c12d22306246e4cb91b1530ed commit: 503c1586ac80109089f0bf6d0a1a0a579a19a6d7 Author: Brian Dolbec gmail com> AuthorDate: Mon Feb 14 00:49:30 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Feb 14 00:49:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D503c1586 fix a missed color_off(), add myself to the copyright, whitespace cleanin= g --- layman/config.py | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/layman/config.py b/layman/config.py index e515155..6f8f658 100644 --- a/layman/config.py +++ b/layman/config.py @@ -10,6 +10,7 @@ # Copyright: # (c) 2005 - 2009 Gunnar Wrobel # (c) 2009 Sebastian Pipping +# (c) 2010 - 2011 Brian Dolbec # Distributed under the terms of the GNU General Public Lice= nse v2 # # Author(s): @@ -30,18 +31,14 @@ __version__ =3D "$Id: config.py 286 2007-01-09 17:48:= 23Z wrobel $" import sys, ConfigParser import os =20 -from optparse import OptionParser, OptionGroup +from optparse import OptionParser, OptionGroup =20 -#from layman.debug import OUT -from layman.output import OUT +#from layman.debug import OUT +from layman.output import OUT =20 -from layman.version import VERSION +from layman.constants import OFF +from layman.version import VERSION =20 -#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D -# -# Class Config -# -#-----------------------------------------------------------------------= -------- =20 _USAGE =3D """ layman (-a|-d|-s|-i) (OVERLAY|ALL) @@ -375,7 +372,7 @@ class ArgsParser(object): =20 =20 if self.options.__dict__['nocolor']: - self.output.color_off() + self.output.set_colorize(OFF) =20 # Fetch only an alternate config setting from the options if not self.options.__dict__['config'] is None: From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PorVe-0004cl-EJ for garchives@archives.gentoo.org; Mon, 14 Feb 2011 06:02:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7257E09CE; Mon, 14 Feb 2011 06:00:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A52D2E09CE for ; Mon, 14 Feb 2011 06:00:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 587281B4237 for ; Mon, 14 Feb 2011 06:00:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C34958006A for ; Mon, 14 Feb 2011 06:00:33 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <503c1586ac80109089f0bf6d0a1a0a579a19a6d7.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/config.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 503c1586ac80109089f0bf6d0a1a0a579a19a6d7 Date: Mon, 14 Feb 2011 06:00:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1667099345ca37ebb0650e02fc9998d8 Message-ID: <20110214060033.hBjacpzK2YXu2R9uiaVfw0jp36s5wOI3r46mRs0r-lc@z> commit: 503c1586ac80109089f0bf6d0a1a0a579a19a6d7 Author: Brian Dolbec gmail com> AuthorDate: Mon Feb 14 00:49:30 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Feb 14 00:49:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D503c1586 fix a missed color_off(), add myself to the copyright, whitespace cleanin= g --- layman/config.py | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/layman/config.py b/layman/config.py index e515155..6f8f658 100644 --- a/layman/config.py +++ b/layman/config.py @@ -10,6 +10,7 @@ # Copyright: # (c) 2005 - 2009 Gunnar Wrobel # (c) 2009 Sebastian Pipping +# (c) 2010 - 2011 Brian Dolbec # Distributed under the terms of the GNU General Public Lice= nse v2 # # Author(s): @@ -30,18 +31,14 @@ __version__ =3D "$Id: config.py 286 2007-01-09 17:48:= 23Z wrobel $" import sys, ConfigParser import os =20 -from optparse import OptionParser, OptionGroup +from optparse import OptionParser, OptionGroup =20 -#from layman.debug import OUT -from layman.output import OUT +#from layman.debug import OUT +from layman.output import OUT =20 -from layman.version import VERSION +from layman.constants import OFF +from layman.version import VERSION =20 -#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D -# -# Class Config -# -#-----------------------------------------------------------------------= -------- =20 _USAGE =3D """ layman (-a|-d|-s|-i) (OVERLAY|ALL) @@ -375,7 +372,7 @@ class ArgsParser(object): =20 =20 if self.options.__dict__['nocolor']: - self.output.color_off() + self.output.set_colorize(OFF) =20 # Fetch only an alternate config setting from the options if not self.options.__dict__['config'] is None: