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

["André Erdmann" <dywi@mailerd.de>]

commit:     796c1d77dafadccc44e028d91366228502af4416
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Feb 20 21:20:28 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Feb 20 21:20:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=796c1d77

roverlay-setup, config import: minor improvement

fs_ops.unlink() always succeeds in --pretend mode (no-op), so "roverlay-setup
--pretend" gives misleading output when user_config_root==config_root.

=> do not reset user_conf_root in --pretend mode if it isn't a symlink.

---
 roverlay/setupscript/initenv.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/roverlay/setupscript/initenv.py b/roverlay/setupscript/initenv.py
index 58677e1..ef06436 100644
--- a/roverlay/setupscript/initenv.py
+++ b/roverlay/setupscript/initenv.py
@@ -186,15 +186,11 @@ class SetupInitEnvironment (
       # assert os.path.isdir ( os.path.dirname(user_conf_root) == work_root )
 
       if user_conf_root is None and (
-         fs_ops.unlink ( setup_env.user_conf_root )
+         not pretend or os.path.islink ( setup_env.user_conf_root )
       ):
-         # config_root was a symlink
-
-         if pretend:
-            user_conf_root = setup_env.user_conf_root
-         else:
+         if fs_ops.unlink ( setup_env.user_conf_root ):
+            # user_conf_root was a symlink
             user_conf_root = setup_env.get_user_config_root()
-
       # -- end if