1 |
commit: 510591de64c2dbca08c7ce6e27f6f3341cae8642 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 22 00:17:29 2015 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 22 00:17:29 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=510591de |
7 |
|
8 |
repoman: Move the pythonpath modification code back into the repoman bin |
9 |
|
10 |
bin/repoman | 5 +++-- |
11 |
pym/repoman/main.py | 4 ---- |
12 |
2 files changed, 3 insertions(+), 6 deletions(-) |
13 |
|
14 |
diff --git a/bin/repoman b/bin/repoman |
15 |
index 05d842f..819e0f5 100755 |
16 |
--- a/bin/repoman |
17 |
+++ b/bin/repoman |
18 |
@@ -26,8 +26,9 @@ except KeyboardInterrupt: |
19 |
sys.exit(1) |
20 |
|
21 |
from os import path as osp |
22 |
-pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") |
23 |
-sys.path.insert(0, pym_path) |
24 |
+if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): |
25 |
+ pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") |
26 |
+ sys.path.insert(0, pym_path) |
27 |
import portage |
28 |
portage._internal_caller = True |
29 |
from repoman.main import repoman_main |
30 |
|
31 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
32 |
index 808c55e..e232558 100755 |
33 |
--- a/pym/repoman/main.py |
34 |
+++ b/pym/repoman/main.py |
35 |
@@ -8,10 +8,6 @@ import io |
36 |
import logging |
37 |
import sys |
38 |
|
39 |
-from os import path as osp |
40 |
-if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): |
41 |
- pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__)))) #, "pym") |
42 |
- sys.path.insert(0, pym_path) |
43 |
# import our centrally initialized portage instance |
44 |
from repoman._portage import portage |
45 |
portage._internal_caller = True |