mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' into 'master'

Browse source 
HTTP, HTTPS

See merge request fdroid/fdroidserver!360
This commit is contained in:
Hans-Christoph Steiner 2017-10-24 13:40:53 +00:00
commit 23265e3290
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/signatures.py
View file

@ -13,7 +13,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from argparse import ArgumentParser from argparse import ArgumentParser
@ -47,7 +47,7 @@ def extract_signature(apkpath):
def extract(config, options): def extract(config, options):
# Create tmp dir if missing... # Create tmp dir if missing…
tmp_dir = 'tmp' tmp_dir = 'tmp'
if not os.path.exists(tmp_dir): if not os.path.exists(tmp_dir):
os.mkdir(tmp_dir) os.mkdir(tmp_dir)
@ -56,7 +56,7 @@ def extract(config, options):
logging.critical(_('no APK supplied')) logging.critical(_('no APK supplied'))
sys.exit(1) sys.exit(1)
# iterate over supplied APKs downlaod and extract them... # iterate over supplied APKs downlaod and extract them…
httpre = re.compile('https?:\/\/') httpre = re.compile('https?:\/\/')
for apk in options.APK: for apk in options.APK:
try: try:
@ -76,7 +76,7 @@ def extract(config, options):
if tmp_apk and os.path.exists(tmp_apk): if tmp_apk and os.path.exists(tmp_apk):
os.remove(tmp_apk) os.remove(tmp_apk)
else: else:
logging.warn(_('refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}').format(apkfilename=apk)) logging.warn(_('refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}').format(apkfilename=apk))
except FDroidException as e: except FDroidException as e:
logging.warning(_("Failed fetching signatures for '{apkfilename}': {error}") logging.warning(_("Failed fetching signatures for '{apkfilename}': {error}")
.format(apkfilename=apk, error=e)) .format(apkfilename=apk, error=e))