Merge pull request #674 from furlongm/develop

fix rpm building

Author: furlongm

errata/sources/distros/debian.py

@@ -84,7 +84,6 @@ def parse_debian_package_file_map(data, repo):
             Source: 389-ds-base
             Source-Version: 1.4.0.21-1+deb10u1
     """
-    global DSCs
     parsing_dsc = False
     for line in data.splitlines():
         if line.startswith('Path:'):
@@ -236,7 +235,6 @@ def parse_debian_erratum_package(line, accepted_codenames):
 def get_debian_dsc_package_list(package, version):
     """ Get the package list from a DSC file for a given source package/version
     """
-    global DSCs
     if not DSCs.get(package) or not DSCs[package].get(version):
         return
     package_list = DSCs[package][version].get('package_list')
@@ -247,7 +245,6 @@ def get_debian_dsc_package_list(package, version):
 def fetch_debian_dsc_package_list(package, version):
     """ Fetch the package list from a DSC file for a given source package/version
     """
-    global DSCs
     if not DSCs.get(package) or not DSCs[package].get(version):
         warning_message.send(sender=None, text=f'No DSC found for {package} {version}')
         return

patchman-client.spec

@@ -8,7 +8,7 @@ License: GPLv3
 URL: http://patchman.openbytes.ie
 Source: %{expand:%%(pwd)}
 BuildArch: noarch
-Requires: curl which coreutils util-linux awk
+Requires: curl which coreutils util-linux gawk
 
 %define binary_payload w9.gzdio
 

scripts/rpm-post-install.sh

@@ -11,6 +11,8 @@ fi
 
 systemctl enable httpd
 systemctl restart httpd
+systemctl enable redis
+systemctl start redis
 
 patchman-set-secret-key
 chown apache /etc/patchman/local_settings.py

setup.cfg

@@ -25,7 +25,7 @@ requires = /usr/bin/python3
     python3-importlib-metadata
     python3-cvss
     python3-redis
-    redis-server
+    redis
     celery
     python3-django-celery-beat
     python3-GitPython

util/__init__.py

@@ -43,7 +43,6 @@
 def get_verbosity():
     """ Get the global verbosity level
     """
-    global verbose
     return verbose
 
 
@@ -57,7 +56,7 @@ def set_verbosity(value):
 def create_pbar(ptext, plength, ljust=35, **kwargs):
     """ Create a global progress bar if global verbose is True
     """
-    global pbar, verbose
+    global pbar
     if verbose and plength > 0:
         jtext = str(ptext).ljust(ljust)
         pbar = tqdm(total=plength, desc=jtext, position=0, leave=True, ascii=' >=')
@@ -67,7 +66,7 @@ def create_pbar(ptext, plength, ljust=35, **kwargs):
 def update_pbar(index, **kwargs):
     """ Update the global progress bar if global verbose is True
     """
-    global pbar, verbose
+    global pbar
     if verbose and pbar:
         pbar.update(n=index-pbar.n)
         if index >= pbar.total:
@@ -79,7 +78,6 @@ def fetch_content(response, text='', ljust=35):
     """ Display a progress bar to fetch the request content if verbose is
         True. Otherwise, just return the request content
     """
-    global verbose
     if not response:
         return
     if verbose: