Use os.path.expanduser() to simplify code.

diff --git a/bin/repoman b/bin/repoman
index 11360683ea106a1ae6661b2e334987bdf2c48fbf..d48b9d13e0e9f6254c2d54c60e26e49fdeece321 100755 (executable)
--- 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'" % \