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 <gentoo-commits+bounces-316501-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PorWN-0004sS-HH
for garchives@archives.gentoo.org; Mon, 14 Feb 2011 06:02:51 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D9441E09A9;
Mon, 14 Feb 2011 06:00:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 97A0CE09A6
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 06:00:29 +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 2736F1B421F
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 06:00:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 91BD88006A
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 06:00:28 +0000 (UTC)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <brian.dolbec@gmail.com>
Message-ID: <b214cd3e79ee70aec597262f5bb9bbaf6fdc74e5.dol-sen@gentoo>
Subject: [gentoo-commits] proj/layman:master commit in: layman/
X-VCS-Repository: proj/layman
X-VCS-Files: layman/constants.py layman/debug.py
X-VCS-Directories: layman/
X-VCS-Committer: dol-sen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: b214cd3e79ee70aec597262f5bb9bbaf6fdc74e5
Date: Mon, 14 Feb 2011 06:00:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: d2eefa4566c2191175aedfc1b3d014b4
commit: b214cd3e79ee70aec597262f5bb9bbaf6fdc74e5
Author: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Mon Jan 17 06:46:38 2011 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Feb 11 10:49:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D=
commit;h=3Db214cd3e
Move color codes to a new file.
Add some message string constants
---
layman/constants.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
layman/debug.py | 22 ++++++++--------------
2 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/layman/constants.py b/layman/constants.py
new file mode 100644
index 0000000..7fc72ea
--- /dev/null
+++ b/layman/constants.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+########################################################################=
#########
+# LAYMAN CONSTANTS
+########################################################################=
#########
+# File: constants.py
+#
+# Handles layman actions via the command line interface.
+#
+# Copyright:
+# (c) 2010 - 2011
+# Gunnar Wrobel
+# Brian Dolbec
+# Distributed under the terms of the GNU General Public Lice=
nse v2
+#
+# Author(s):
+# Gunnar Wrobel <wrobel@gentoo.org>
+# Brian Dolbec <brian.dolbec@gmail.com
+#
+''' Provides the command line actions that can be performed by layman.''=
'
+
+__version__ =3D "$Id: constants.py 2011-01-16 23:52 PST Brian Dolbec$"
+
+
+
+
+########################################################################=
#########
+##
+## Color codes (taken from portage)
+##
+########################################################################=
#########
+
+esc_seq =3D '\x1b['
+
+codes =3D {}
+codes['reset'] =3D esc_seq + '39;49;00m'
+codes['red'] =3D esc_seq + '31;01m'
+codes['green'] =3D esc_seq + '32;01m'
+codes['yellow'] =3D esc_seq + '33;01m'
+codes['turquoise'] =3D esc_seq + '36;01m'
+
+
+NOT_OFFICIAL_MSG =3D '*** This is not an official gentoo overlay ***\n'
+NOT_SUPPORTED_MSG =3D '*** You are lacking the necessary tools' +\
+ ' to install this overlay ***\n'
diff --git a/layman/debug.py b/layman/debug.py
index e5a5d61..7c42974 100644
--- a/layman/debug.py
+++ b/layman/debug.py
@@ -18,20 +18,8 @@ import sys, inspect, types
=20
from optparse import OptionGroup
=20
-########################################################################=
#########
-##
-## Color codes (taken from portage)
-##
-########################################################################=
#########
+from layman.constants import codes
=20
-esc_seq =3D '\x1b['
-
-codes =3D {}
-codes['reset'] =3D esc_seq + '39;49;00m'
-codes['red'] =3D esc_seq + '31;01m'
-codes['green'] =3D esc_seq + '32;01m'
-codes['yellow'] =3D esc_seq + '33;01m'
-codes['turquoise'] =3D esc_seq + '36;01m'
=20
########################################################################=
#########
##
@@ -112,6 +100,8 @@ class Message:
=20
def cli_opts(self, parser):
=20
+ #print "Parsing debug opts"
+
group =3D OptionGroup(parser,
'<Debugging options>',
'Control the debugging features of '
@@ -307,6 +297,8 @@ class Message:
=20
def info (self, info, level =3D 4):
=20
+ #print "info =3D", info
+
if type(info) not in types.StringTypes:
info =3D str(info)
=20
@@ -346,6 +338,8 @@ class Message:
=20
def warn (self, warn, level =3D 4):
=20
+ #print "DEBUG.warn()"
+
if type(warn) not in types.StringTypes:
warn =3D str(warn)
=20
@@ -453,7 +447,7 @@ class Message:
## Remove printed characters from output
x =3D x[60:]
## Print final line
- print >> self.debug_out, ls + '// ' + x=20
+ print >> self.debug_out, ls + '// ' + x
=20
if self.debug_vrb =3D=3D 1:
# Top line indicates class and method