Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename util._create_homedir() to more general util._create_if_necessary().

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-05-17 02:45:03 +00:00
parent 2abcf8a733
commit c6880b5779
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/util.py
View File

@ -115,7 +115,7 @@ def _copy_data(instream, outstream):
else: else:
log.debug("_copy_data(): Closed output, %d bytes sent." % sent) log.debug("_copy_data(): Closed output, %d bytes sent." % sent)
def _create_homedir(homedir): def _create_if_necessary(directory):
"""Create the specified GnuPG home directory, if necessary. """Create the specified GnuPG home directory, if necessary.
:param str homedir: The directory to use. :param str homedir: The directory to use.
@ -123,24 +123,23 @@ def _create_homedir(homedir):
:returns: True if no errors occurred and the directory was created or :returns: True if no errors occurred and the directory was created or
existed beforehand, False otherwise. existed beforehand, False otherwise.
""" """
if not os.path.isabs(homedir):
message = ("Got non-abs gpg home dir path: %s" % homedir)
log.debug("util._create_homedir(): %s" % message)
homedir = os.path.abspath(homedir)
if not os.path.isdir(homedir):
message = ("Creating gpg home dir: %s" % homedir)
log.debug("util._create_homedir():")
log.info("%s" % message)
if not os.path.isabs(directory):
message = ("Got non-absolute path: %s" % directory)
log.debug("util._create_if_necessary(): %s" % message)
directory = os.path.abspath(directory)
if not os.path.isdir(directory):
message = ("Creating directory: %s" % directory)
log.debug("util._create_if_necessary():")
log.info("%s" % message)
try: try:
os.makedirs(homedir, 0x1C0) os.makedirs(directory, 0x1C0)
except OSError as ose: except OSError as ose:
log.error(ose, exc_info=1) log.error(ose, exc_info=1)
return False return False
else: else:
log.debug("util._create_homedir(): Created directory.") log.debug("util._create_if_necessary(): Created directory.")
return True
else:
return True return True
def _find_binary(binary=None): def _find_binary(binary=None):