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 1PqBn9-0006s1-Fa for garchives@archives.gentoo.org; Thu, 17 Feb 2011 21:53:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24882E0630; Thu, 17 Feb 2011 21:53:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D88D0E0843 for ; Thu, 17 Feb 2011 21:53:30 +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 311BB1B4153 for ; Thu, 17 Feb 2011 21:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8CFB28006E for ; Thu, 17 Feb 2011 21:53:29 +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: <6d023e32aa94c42f6307f2263ac49a6f09d7680e.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/source.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 6d023e32aa94c42f6307f2263ac49a6f09d7680e Date: Thu, 17 Feb 2011 21:53:29 +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: f6b69a43e4c404ae54fb7ea82760ca07 commit: 6d023e32aa94c42f6307f2263ac49a6f09d7680e Author: Brian Dolbec gmail com> AuthorDate: Thu Feb 17 21:49:28 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Feb 17 21:49:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D6d023e32 shorten long lines --- layman/overlays/source.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/layman/overlays/source.py b/layman/overlays/source.py index 9f7eaef..e5cd880 100644 --- a/layman/overlays/source.py +++ b/layman/overlays/source.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -########################################################################= ######### +########################################################################= ####### # LAYMAN OVERLAY SOURCE BASE CLASS -########################################################################= ######### +########################################################################= ####### # File: source.py # # Base class for the different overlay types. @@ -34,7 +34,8 @@ def _resolve_command(command): f =3D os.path.join(d, command) if os.path.exists(f): return ('Command', f) - raise Exception('Cound not resolve command "%s" based on PATH "%= s"' % (command, env_path)) + raise Exception('Cound not resolve command ' +\ + '"%s" based on PATH "%s"' % (command, env_path)) =20 =20 def require_supported(binaries): @@ -52,7 +53,8 @@ class OverlaySource(object): =20 type_key =3D None =20 - def __init__(self, parent, xml, config, _location, ignore =3D 0, qui= et =3D False): + def __init__(self, parent, xml, config, _location, + ignore =3D 0, quiet =3D False): self.parent =3D parent self.src =3D _location self.config =3D config @@ -72,8 +74,8 @@ class OverlaySource(object): mdir =3D path([base, self.parent.name]) =20 if os.path.exists(mdir): - raise Exception('Directory ' + mdir + ' already exists. Will= not ov' - 'erwrite its contents!') + raise Exception('Directory ' + mdir + + ' already exists. Will not overwrite its contents!') =20 os.makedirs(mdir) =20 @@ -86,7 +88,8 @@ class OverlaySource(object): mdir =3D path([base, self.parent.name]) =20 if not os.path.exists(mdir): - self.output.warn('Directory ' + mdir + ' did not exist, no f= iles deleted.') + self.output.warn('Directory ' + mdir + \ + ' did not exist, no files deleted.') return =20 self.output.info('Deleting directory "%s"' % mdir, 2) @@ -124,7 +127,8 @@ class OverlaySource(object): =20 command_repr =3D ' '.join(args) if env_updates: - command_repr =3D '%s %s' % (' '.join('%s=3D%s' % (k, v) for = (k, v) in sorted(env_updates.items())), command_repr) + command_repr =3D '%s %s' % (' '.join('%s=3D%s' % (k, v) for = (k, v) + in sorted(env_updates.items())), command_repr) if cwd: command_repr =3D '( cd %s && %s )' % (cwd, command_repr) =20