From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 30 Mar 2011 15:03:22 +0000 (+0200) Subject: Use os.path.expanduser() to simplify code. X-Git-Tag: v2.2.0_alpha30~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c86270de6ab77366d1bf354f569d2d7d636ca407;p=portage.git Use os.path.expanduser() to simplify code. --- diff --git a/bin/repoman b/bin/repoman index 11360683e..d48b9d13e 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2427,10 +2427,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 = repoman_settings["PORTAGE_GPG_DIR"] - if gpg_dir.startswith("~") and "HOME" in os.environ: - repoman_settings["PORTAGE_GPG_DIR"] = os.path.join( - os.environ["HOME"], gpg_dir[1:].lstrip(os.path.sep)) + repoman_settings["PORTAGE_GPG_DIR"] = os.path.expanduser(repoman_settings["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='%s'" % \