aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-01-06 14:13:45 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-01-06 14:35:46 -0800
commit4c44549c625c6503b07eff3398e566252f551e47 (patch)
tree1f4da72303ef8c6f009994a9ec3fcc8acccbb647
parentgkeys, gkeys-gen: Fix man page installation (diff)
downloadgentoo-keys-4c44549c625c6503b07eff3398e566252f551e47.tar.gz
gentoo-keys-4c44549c625c6503b07eff3398e566252f551e47.tar.bz2
gentoo-keys-4c44549c625c6503b07eff3398e566252f551e47.zip
gkeys/setup.py py2man import fix
The ebuild install was failing to find options.py. adding back an absolute import worked.
-rwxr-xr-xgkeys-gen/setup.py7
-rwxr-xr-xgkeys/setup.py7
-rw-r--r--py2man/manpages.py2
3 files changed, 3 insertions, 13 deletions
diff --git a/gkeys-gen/setup.py b/gkeys-gen/setup.py
index 15c3434..1512219 100755
--- a/gkeys-gen/setup.py
+++ b/gkeys-gen/setup.py
@@ -13,12 +13,7 @@ from gkeygen import __version__, __license__
from gkeygen import Gkeys_Map
from gkeygen.actions import Action_Map, Available_Actions
-try:
- from py2man import manpages
-except ImportError:
- print('creating py2man symlink')
- os.symlink('../py2man', 'py2man')
- from py2man import manpages
+from py2man import manpages
# this affects the names of all the directories we do stuff with
diff --git a/gkeys/setup.py b/gkeys/setup.py
index fdb8e18..5a20738 100755
--- a/gkeys/setup.py
+++ b/gkeys/setup.py
@@ -13,12 +13,7 @@ from gkeys import __version__, __license__
from gkeys import Gkeys_Map
from gkeys.action_map import Action_Map, Available_Actions
-try:
- from py2man import manpages
-except ImportError:
- print('creating py2man symlink')
- os.symlink('../py2man', 'py2man')
- from py2man import manpages
+from py2man import manpages
# this affects the names of all the directories we do stuff with
diff --git a/py2man/manpages.py b/py2man/manpages.py
index 8b87afa..9e75d2e 100644
--- a/py2man/manpages.py
+++ b/py2man/manpages.py
@@ -6,7 +6,7 @@ import codecs
import os
from datetime import datetime
-from options import LONG_OPTS, SHORT_OPTS
+from py2man.options import LONG_OPTS, SHORT_OPTS
ActionStr = '.BR gkeys-%s (1),'