|
 |
b1d80f |
diff -up hplip-3.20.3/base/tui.py.keyserver hplip-3.20.3/base/tui.py
|
|
|
b1d80f |
--- hplip-3.20.3/base/tui.py.keyserver 2020-03-10 09:01:53.000000000 +0100
|
|
|
b1d80f |
+++ hplip-3.20.3/base/tui.py 2020-04-07 08:44:44.319710001 +0200
|
|
|
b1d80f |
@@ -241,6 +241,7 @@ class ProgressMeter(object):
|
|
|
b1d80f |
sys.stdout.write(y)
|
|
|
b1d80f |
|
|
|
b1d80f |
sys.stdout.flush()
|
|
|
b1d80f |
+ sys.stdout.write('\n')
|
|
|
b1d80f |
self.prev_length = len(y)
|
|
|
b1d80f |
self.spinner_pos = (self.spinner_pos + 1) % 8
|
|
|
b1d80f |
|
|
|
b1d80f |
diff -up hplip-3.20.3/base/validation.py.keyserver hplip-3.20.3/base/validation.py
|
|
|
b1d80f |
--- hplip-3.20.3/base/validation.py.keyserver 2020-03-10 09:01:53.000000000 +0100
|
|
|
b1d80f |
+++ hplip-3.20.3/base/validation.py 2020-04-07 08:45:46.657132415 +0200
|
|
|
b1d80f |
@@ -1,4 +1,4 @@
|
|
|
b1d80f |
-#!/usr/bin/env python
|
|
|
b1d80f |
+#!/usr/bin/python3
|
|
|
b1d80f |
# -*- coding: utf-8 -*-
|
|
|
b1d80f |
#
|
|
|
b1d80f |
# (c) Copyright 2015 HP Development Company, L.P.
|
|
|
b1d80f |
@@ -42,8 +42,11 @@ class DigiSign_Verification(object):
|
|
|
b1d80f |
|
|
|
b1d80f |
|
|
|
b1d80f |
class GPG_Verification(DigiSign_Verification):
|
|
|
b1d80f |
- def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
|
|
|
b1d80f |
- self.__pgp_site = pgp_site
|
|
|
b1d80f |
+ def __init__(self, keyservers = ['pool.sks-keyservers.net',
|
|
|
b1d80f |
+ 'keyserver.ubuntu.com',
|
|
|
b1d80f |
+ 'sks-keyservers.net', 'pgp.mit.edu'],
|
|
|
b1d80f |
+ key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
|
|
|
b1d80f |
+ self.__keyservers = keyservers
|
|
|
b1d80f |
self.__key = key
|
|
|
b1d80f |
self.__gpg = utils.which('gpg',True)
|
|
|
b1d80f |
|
|
|
b1d80f |
@@ -82,13 +85,18 @@ class GPG_Verification(DigiSign_Verifica
|
|
|
b1d80f |
|
|
|
b1d80f |
|
|
|
b1d80f |
def __acquire_gpg_key(self):
|
|
|
b1d80f |
-
|
|
|
b1d80f |
- cmd = '%s --homedir %s --no-permission-warning --keyserver %s --recv-keys 0x%X' \
|
|
|
b1d80f |
- % (self.__gpg, self.__gpg_dir, self.__pgp_site, self.__key)
|
|
|
b1d80f |
-
|
|
|
b1d80f |
- log.info("Receiving digital keys: %s" % cmd)
|
|
|
b1d80f |
- status, output = utils.run(cmd)
|
|
|
b1d80f |
- log.debug(output)
|
|
|
b1d80f |
+ for kserver in self.__keyservers:
|
|
|
b1d80f |
+ cmd = '%s --homedir %s --no-permission-warning --keyserver %s --recv-keys 0x%X' \
|
|
|
b1d80f |
+ % (self.__gpg, self.__gpg_dir, kserver, self.__key)
|
|
|
b1d80f |
+
|
|
|
b1d80f |
+ log.info("Receiving digital keys: %s" % cmd)
|
|
|
b1d80f |
+ status, output = utils.run(cmd)
|
|
|
b1d80f |
+ log.debug(output)
|
|
|
b1d80f |
+
|
|
|
b1d80f |
+ if not status:
|
|
|
b1d80f |
+ break
|
|
|
b1d80f |
+ log.info("Receiving keys from {} failed, trying the next keyserver."
|
|
|
b1d80f |
+ .format(kserver))
|
|
|
b1d80f |
|
|
|
b1d80f |
self.__change_owner(True)
|
|
|
b1d80f |
|