[gentoo-commits] proj/R_overlay:master commit in: roverlay/, roverlay/util/

[André Erdmann]

commit:     b2d8535a2b905519d2b7d75c495135c7943edc99
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Feb 21 18:28:08 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Feb 21 18:29:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b2d8535a

roverlay/util/common: get_home_dir()

---
 roverlay/core.py        |  3 ++-
 roverlay/util/common.py | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/roverlay/core.py b/roverlay/core.py
index b8fe6a5..d462f0f 100644
--- a/roverlay/core.py
+++ b/roverlay/core.py
@@ -22,6 +22,7 @@ import logging
 import roverlay.config
 import roverlay.recipe.easylogger
 import roverlay.tools.shenv
+import roverlay.util.common
 
 
 name        = "R_overlay"
@@ -45,7 +46,7 @@ DEFAULT_CONFIG_FILE_NAME = "R-overlay.conf"
 #
 CONFIG_DIRS = tuple ((
    (
-      ( os.getenv ( 'HOME' ) or os.path.expanduser ( '~' ) )
+      ( os.getenv ( 'HOME' ) or roverlay.util.common.get_home_dir ( None ) )
       + os.sep + 'roverlay'
    ),
    # os.sep is '/' if /etc exists, so don't care about that

diff --git a/roverlay/util/common.py b/roverlay/util/common.py
index 30dd310..92c0183 100644
--- a/roverlay/util/common.py
+++ b/roverlay/util/common.py
@@ -11,7 +11,7 @@ __all__= [
    'for_all_files_decorator', 'for_all_files',
    'get_dict_hash', 'keepenv', 'keepenv_v',
    'priosort', 'sysnop', 'getsize', 'is_vcs_dir', 'is_not_vcs_dir',
-    'headtail', 'try_unlink',
+    'headtail', 'try_unlink', 'get_pwd_info', 'get_home_dir',
 ]
 
 
@@ -19,6 +19,7 @@ import errno
 import os
 import sys
 import logging
+import pwd
 
 LOGGER = logging.getLogger ( 'util' )
 
@@ -322,3 +323,31 @@ def is_vcs_dir ( dirpath ):
 def is_not_vcs_dir ( dirpath ):
    return not is_vcs_dir ( dirpath )
 # --- end of is_not_vcs_dir (...) ---
+
+def get_pwd_info ( user=None ):
+   """Returns the passwd entry of the given user.
+
+   arguments:
+   * user -- name, uid or None (os.getuid()). Defaults to None.
+   """
+   if user is None:
+      return pwd.getpwuid ( os.getuid() )
+   elif isinstance ( user, int ):
+      return pwd.getpwuid ( user )
+   else:
+      try:
+         uid = int ( user, 10 )
+      except ValueError:
+         return pwd.getpwnam ( user )
+      else:
+         return pwd.getpwuid ( uid )
+# --- end of get_pwd_info (...) ---
+
+def get_home_dir ( user=None ):
+   """Returns a user's home directory.
+
+   arguments:
+   * user -- name, uid or None (os.getuid()). Defaults to None.
+   """
+   return get_pwd_info ( user ).pw_dir
+# --- end of get_home_dir (...) ---