[elbe-devel] [PATCH 03/10] gpg: remove pyme fallback

[Manuel Traut]

pyme doesn't provide a keygrip that is needed to unlock keys in the
gpg-agent. Therefore remove the fallback and always use python-gpg.

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 debian/control           | 2 +-
 elbepack/debinstaller.py | 6 +-----
 elbepack/egpg.py         | 8 ++------
 elbepack/finetuning.py   | 7 +------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 4749a5d3..057023fa 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Depends: ${misc:Depends},
   python (>= 2.7~),
   python-lxml,
   python-apt,
-  python-pyme|python-gpg,
+  python-gpg,
   python-libvirt,
   wget,
   cpio
diff --git a/elbepack/debinstaller.py b/elbepack/debinstaller.py
index 6bd166ef..0fa8fffa 100644
--- a/elbepack/debinstaller.py
+++ b/elbepack/debinstaller.py
@@ -23,11 +23,7 @@ except ImportError:
     import urllib2
     urlopen = urllib2.urlopen
 
-try:
-    from gpg import core
-except ImportError:
-    from pyme import core
-
+from gpg import core
 from shutil import copyfileobj, copyfile
 
 from elbepack.filesystem import TmpdirFilesystem
diff --git a/elbepack/egpg.py b/elbepack/egpg.py
index 32b07402..6d9072e2 100644
--- a/elbepack/egpg.py
+++ b/elbepack/egpg.py
@@ -9,12 +9,8 @@ from __future__ import print_function
 
 import os
 
-try:
-    from gpg import core
-    from gpg.constants import sigsum, sig
-except ImportError:
-    from pyme import core
-    from pyme.constants import sigsum, sig
+from gpg import core
+from gpg.constants import sigsum, sig
 
 from elbepack.filesystem import hostfs
 
diff --git a/elbepack/finetuning.py b/elbepack/finetuning.py
index 5b0cd734..5f2b0010 100644
--- a/elbepack/finetuning.py
+++ b/elbepack/finetuning.py
@@ -11,12 +11,7 @@ from __future__ import print_function
 import os
 
 from shutil import rmtree
-
-try:
-    from gpg import core
-except ImportError:
-    from pyme import core
-
+from gpg import core
 from apt.package import FetchError
 
 from elbepack.repomanager import UpdateRepo
-- 
2.20.1