[gentoo-commits] proj/portage:master commit in: bin/, pym/repoman/

[Brian Dolbec]

commit:     510591de64c2dbca08c7ce6e27f6f3341cae8642
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 00:17:29 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 00:17:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=510591de

repoman: Move the pythonpath modification code back into the repoman bin

 bin/repoman         | 5 +++--
 pym/repoman/main.py | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index 05d842f..819e0f5 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -26,8 +26,9 @@ except KeyboardInterrupt:
        sys.exit(1)
 
 from os import path as osp
-pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")
-sys.path.insert(0, pym_path)
+if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), 
".portage_not_installed")):
+       pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), 
"pym")
+       sys.path.insert(0, pym_path)
 import portage
 portage._internal_caller = True
 from repoman.main import repoman_main

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 808c55e..e232558 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -8,10 +8,6 @@ import io
 import logging
 import sys
 
-from os import path as osp
-if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), 
".portage_not_installed")):
-       pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__)))) 
#, "pym")
-       sys.path.insert(0, pym_path)
 # import our centrally initialized portage instance
 from repoman._portage import portage
 portage._internal_caller = True