update to pass-import-3.4

This commit is contained in:
sthen 2022-12-11 08:40:18 +00:00
parent 59ea6e158a
commit 26df655cde
3 changed files with 5 additions and 26 deletions

View File

@ -1,7 +1,6 @@
COMMENT= importer for pass (passwordstore)
MODPY_EGG_VERSION= 3.3
REVISION= 2
MODPY_EGG_VERSION= 3.4
DISTNAME= pass-import-${MODPY_EGG_VERSION}
CATEGORIES= security

View File

@ -1,2 +1,2 @@
SHA256 (pass-import-3.3.tar.gz) = 9Mx8W7ST0+iTb6anzEt0TWhRoM+1HcILLR0KbB6fPpw=
SIZE (pass-import-3.3.tar.gz) = 89623
SHA256 (pass-import-3.4.tar.gz) = h2z2UyyR3tOPcwTHRRxMWr6iwpugWopsk4i/RMDKCZM=
SIZE (pass-import-3.4.tar.gz) = 89468

View File

@ -1,27 +1,7 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -12,14 +12,17 @@ except ImportError:
PANDOC = False
from pathlib import Path
-from share import makedoc
+try:
+ from share import makedoc
+except ImportError:
+ PANDOC = False
from setuptools import setup
-makedoc()
if not PANDOC:
print("Warning: 'pypandoc' is required to generate the manual pages.")
else:
+ makedoc()
try:
for name in ['pass-import', 'pimport']:
pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
@@ -31,7 +34,7 @@ else:
@@ -12,7 +12,7 @@ from setuptools import setup
share = Path(sys.prefix, 'share')
base = '/usr'
@ -30,7 +10,7 @@ Index: setup.py
base = '/usr/local'
lib = Path(base, 'lib', 'password-store', 'extensions')
@@ -47,7 +50,7 @@ if '--user' in sys.argv:
@@ -28,7 +28,7 @@ if '--user' in sys.argv:
setup(
data_files=[