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 1Q9ut0-0002bN-HL for garchives@archives.gentoo.org; Wed, 13 Apr 2011 07:53:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A31891C041; Wed, 13 Apr 2011 07:52:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 715A11C041 for ; Wed, 13 Apr 2011 07:52:12 +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 EB2561B4110 for ; Wed, 13 Apr 2011 07:52:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 081F480065 for ; Wed, 13 Apr 2011 07:52:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <0fcb4e236b32ebe687a9807e4a4e65835d19ea31.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0fcb4e236b32ebe687a9807e4a4e65835d19ea31 Date: Wed, 13 Apr 2011 07:52:11 +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: d765bbcf5df3e0d3e22a8425b526ac76 commit: 0fcb4e236b32ebe687a9807e4a4e65835d19ea31 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Wed Mar 30 15:03:22 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 13 07:40:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0fcb4e23 Use os.path.expanduser() to simplify code. --- bin/repoman | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index 8b1efc5..86eba81 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2426,10 +2426,7 @@ else: logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman= _settings["PORTAGE_GPG_DIR"]) else: raise portage.exception.MissingParameter("PORTAGE_GPG_DIR is unset!"= ) - gpg_dir =3D repoman_settings["PORTAGE_GPG_DIR"] - if gpg_dir.startswith("~") and "HOME" in os.environ: - repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.join( - os.environ["HOME"], gpg_dir[1:].lstrip(os.path.sep)) + repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.expanduser(repoman_set= tings["PORTAGE_GPG_DIR"]) if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): raise portage.exception.InvalidLocation( "Unable to access directory: PORTAGE_GPG_DIR=3D'%s'" % \