Ufak tefek işler

GPG key kontrolü için config dosyasına parametre eklendi. pycurl ile sourceforge üzerinden veri çekerken yaşanan sıkıntı giderildi. önceden değiştirilen ui fonksiyonlarının süper sınıfına eklenmemiş parametreler eklendi.

config/inary.conf-armv7h

@@ -50,5 +50,6 @@ allow_static=False
 ignore_delta = False
 ignore_safety = False
 ssl_verify = True
+gpg_verify = False
 package_cache = False
 package_cache_limit = 0

config/inary.conf-i686

@@ -50,5 +50,6 @@ allow_static=False
 ignore_delta = False
 ignore_safety = False
 ssl_verify = True
+gpg_verify = False
 package_cache = False
 package_cache_limit = 0

config/inary.conf-x86_64

@@ -51,5 +51,6 @@ distribution_id = s19
 ignore_delta = False
 ignore_safety = False
 ssl_verify = True
+gpg_verify = False
 package_cache = False
 package_cache_limit = 0

inary/db/componentdb.py

@@ -212,7 +212,7 @@ class ComponentDB(lazydb.LazyDB):
 
     # Returns the component with combined packages and sources from all repos that contain this component
     # If walk is True than also the sub components' sources from all repos are returned
-    def get_union_sources(self, component_name, walk=False):
+    def get_union_sources(self, component_name, repo=None, walk=False):
 
         component = self.get_union_component(component_name)
         if not walk:
@@ -221,7 +221,7 @@ class ComponentDB(lazydb.LazyDB):
         sources = []
         sources.extend(component.sources)
 
-        sub_components = [x for x in self.list_components() if x.startswith(component_name + ".")]
+        sub_components = [x for x in self.list_components(repo) if x.startswith(component_name + ".")]
         for sub in sub_components:
             try:
                 sources.extend(self.get_union_component(sub).sources)

inary/fetcher.py

@@ -180,6 +180,7 @@ class Fetcher:
             c.setopt(pycurl.AUTOREFERER, 1)
             c.setopt(pycurl.CONNECTTIMEOUT, timeout)  # This for waiting to establish connection
             # c.setopt(pycurl.TIMEOUT, timeout) # This for waiting to read data
+            c.setopt(pycurl.FOLLOWLOCATION, True)
             c.setopt(pycurl.MAXREDIRS, 10)
             c.setopt(pycurl.NOSIGNAL, True)
             # Header
@@ -219,7 +220,6 @@ class Fetcher:
                 FetchError(_('A problem occurred. Please check the archive address and/or permissions again.')))
 
         shutil.move(self.partial_file, self.archive_file)
-
         return self.archive_file
 
     def _get_http_headers(self):

inary/file.py

@@ -269,7 +269,7 @@ class File:
                 return True
 
             ret, out, err = inary.util.run_batch('gpg --verify ' + sigfilename)
-            if ret:
+            if ctx.config.values.general.ssl_verify and ret:
                 ctx.ui.info("Checking GPG Signature failed ('gpg --verify {}')".format(sigfilename), color='cyan')
                 ctx.ui.info(err.decode("utf-8"), color='faintcyan')
                 if not ctx.ui.confirm("Would you like to skip checking gpg signature?"):

inary/ui.py

@@ -99,10 +99,10 @@ class UI(object):
         """display progress"""
         pass
 
-    def status(self, msg=None):
+    def status(self, msg=None, push_screen=True):
         """set status, if not given clear it"""
         pass
 
-    def notify(self, event, **keywords):
+    def notify(self, event, logging=True, **keywords):
         """notify UI of a significant event"""
         pass