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 31BBF59CA5 for ; Mon, 21 Mar 2016 05:15:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B95F21C006; Mon, 21 Mar 2016 05:15:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1B3321C006 for ; Mon, 21 Mar 2016 05:15:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 214B3340890 for ; Mon, 21 Mar 2016 05:15:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E687F850 for ; Mon, 21 Mar 2016 05:15:03 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1458537288.1016f0f3e15eb6a4e7cd203a35554d8c335e3e0a.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/main.py catalyst/support.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1016f0f3e15eb6a4e7cd203a35554d8c335e3e0a X-VCS-Branch: master Date: Mon, 21 Mar 2016 05:15:03 +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: 938d56e5-2d61-4c6f-aaa3-65a0117fea5d X-Archives-Hash: 38c4da2c5b912ce9503e8cc710aefa15 commit: 1016f0f3e15eb6a4e7cd203a35554d8c335e3e0a Author: Mike Frysinger gentoo org> AuthorDate: Mon Mar 21 05:14:48 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Mar 21 05:14:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1016f0f3 lint: clean up a few minor warnings Should be no real functional changes here. catalyst/base/stagebase.py | 3 --- catalyst/main.py | 4 +--- catalyst/support.py | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 98c4959..9d3841c 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -5,9 +5,6 @@ import shutil import sys from stat import ST_UID, ST_GID, ST_MODE -# for convienience -pjoin = os.path.join - from snakeoil import fileutils from DeComp.compress import CompressMap diff --git a/catalyst/main.py b/catalyst/main.py index 5b6b9ac..7c6a5d8 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -13,8 +13,6 @@ import sys from snakeoil import process -__selfpath__ = os.path.abspath(os.path.dirname(__file__)) - from DeComp.definitions import (COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS, CONTENTS_DEFINITIONS) from DeComp.contents import ContentsMap @@ -63,7 +61,7 @@ def parse_config(config_files): conf_values[x]=confdefaults[x] # add our python base directory to use for loading target arch's - conf_values["PythonDir"] = __selfpath__ + conf_values["PythonDir"] = os.path.dirname(os.path.realpath(__file__)) # print out any options messages for opt in conf_values['options']: diff --git a/catalyst/support.py b/catalyst/support.py index 4efe96c..d13422d 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -21,8 +21,7 @@ def list_bashify(mylist): # surround args with quotes for passing to bash, # allows things like "<" to remain intact mypack[x]="'"+mypack[x]+"'" - mypack = ' '.join(mypack) - return mypack + return ' '.join(mypack) class CatalystError(Exception):