From: Mike Frysinger Date: Thu, 20 Apr 2006 23:19:45 +0000 (-0000) Subject: if PORTAGE_GPG_DIR is not set then default to ~/.gnupg instead of just dumping an... X-Git-Tag: v2.1_pre10~93 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37b94a3fe90923dd5975ebdab8b1c2ac7f5ca3bd;p=portage.git if PORTAGE_GPG_DIR is not set then default to ~/.gnupg instead of just dumping an error svn path=/main/trunk/; revision=3180 --- diff --git a/bin/repoman b/bin/repoman index fd67ce117..a97611ee0 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1574,7 +1574,12 @@ else: if "PORTAGE_GPG_KEY" not in repoman_settings: raise portage_exception.MissingParameter("PORTAGE_GPG_KEY is unset!") if "PORTAGE_GPG_DIR" not in repoman_settings: - raise portage_exception.MissingParameter("PORTAGE_GPG_DIR is unset!") + if os.environ.has_key("HOME") and os.access(os.environ["HOME"]+"/.gnupg", os.R_OK): + repoman_settings["PORTAGE_GPG_DIR"] = os.environ["HOME"]+"/.gnupg" + if quiet < 1: + print "Automatically setting PORTAGE_GPG_DIR to",repoman_settings["PORTAGE_GPG_DIR"] + else: + raise portage_exception.MissingParameter("PORTAGE_GPG_DIR is unset!") if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): raise portage_exception.InvalidLocation( "Unable to access directory: PORTAGE_GPG_DIR='%s'" % \