From 1300771badb41ada76db5d145f186d41cbe09383 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 18 Jun 2021 10:24:44 +0200 Subject: [PATCH] 'import resource' only where its used, Windows does not have it --- fdroidserver/build.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 7c4d900b..89097166 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -23,7 +23,6 @@ import glob import subprocess import posixpath import re -import resource import sys import tarfile import threading @@ -1026,17 +1025,22 @@ def main(): raise FDroidException("No apps to process.") # make sure enough open files are allowed to process everything - soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE) - if len(apps) > soft: - try: - soft = len(apps) * 2 - if soft > hard: - soft = hard - resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard)) - logging.debug(_('Set open file limit to {integer}') - .format(integer=soft)) - except (OSError, ValueError) as e: - logging.warning(_('Setting open file limit failed: ') + str(e)) + try: + import resource # not available on Windows + + soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE) + if len(apps) > soft: + try: + soft = len(apps) * 2 + if soft > hard: + soft = hard + resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard)) + logging.debug(_('Set open file limit to {integer}') + .format(integer=soft)) + except (OSError, ValueError) as e: + logging.warning(_('Setting open file limit failed: ') + str(e)) + except ImportError: + pass if options.latest: for app in apps.values():