base, parser, fetch: add NOGIX and NOGIX__ARCH var in spec file to control use gix fetch src

Author: eatradish

acbs/base.py

@@ -6,7 +6,7 @@
 
 
 class ACBSSourceInfo(object):
-    def __init__(self, type: str, url: str, revision=None, branch=None, depth=None) -> None:
+    def __init__(self, type: str, url: str, revision=None, branch=None, depth=None, no_gix=False) -> None:
         self.type = type
         self.url = url
         self.revision: Optional[str] = revision
@@ -21,9 +21,10 @@ def __init__(self, type: str, url: str, revision=None, branch=None, depth=None)
         self.copy_repo: bool = False
         # this is a tristate: 0 - off; 1 - on (non-recursive); 2 - recursive
         self.submodule: int = 2
+        self.no_gix: bool = no_gix
 
     def __repr__(self) -> str:
-        return '<ACBSSourceInfo {type}: {url}:{branch}@{revision} integrity: {checksum}>'.format(type=self.type, url=self.url, branch=self.branch, revision=self.revision, checksum=self.chksum)
+        return '<ACBSSourceInfo {type}: {url}:{branch}@{revision} integrity: {checksum} no_gix: {no_gix}>'.format(type=self.type, url=self.url, branch=self.branch, revision=self.revision, checksum=self.chksum, no_gix=self.no_gix)
 
 
 class ACBSPackageInfo(object):

acbs/fetch.py

@@ -119,21 +119,28 @@ def blob_processor(package: ACBSPackageInfo, index: int, source_name: str) -> No
     return tarball_processor_innner(package, index, source_name, False)
 
 
-def git_fetch(info: ACBSSourceInfo, source_location: str, name: str) -> Optional[ACBSSourceInfo]:
-    try:
-        # Try use gix
-        return gix_fetch(info, source_location, name)
-    except:
-        # Fallback to git
-        full_path = os.path.join(source_location, name)
-        if not os.path.exists(full_path):
-            subprocess.check_call(['git', 'clone', '--bare', info.url, full_path])
-        else:
-            logging.info('Updating repository...')
-            subprocess.check_call(
+def git_fetch_fallback(info: ACBSSourceInfo, source_location: str, name: str) -> Optional[ACBSSourceInfo]:
+    if info.no_gix:
+        return git_fetch(info, source_location, name)
+    else:
+        try:
+            # Try use gix
+            return gix_fetch(info, source_location, name)
+        except:
+            # Fallback to git
+            return git_fetch(info, source_location, name)
+
+
+def git_fetch(info, source_location, name):
+    full_path = os.path.join(source_location, name)
+    if not os.path.exists(full_path):
+        subprocess.check_call(['git', 'clone', '--bare', info.url, full_path])
+    else:
+        logging.info('Updating repository...')
+        subprocess.check_call(
                 ['git', 'fetch', 'origin', '+refs/heads/*:refs/heads/*', '--prune'], cwd=full_path)
-        info.source_location = full_path
-        return info
+    info.source_location = full_path
+    return info
 
 
 def gix_hack(path: str):
@@ -334,7 +341,7 @@ def fossil_processor(package: ACBSPackageInfo, index: int, source_name: str) ->
 
 
 handlers: Dict[str, pair_signature] = {
-    'GIT': (git_fetch, git_processor),
+    'GIT': (git_fetch_fallback, git_processor),
     'SVN': (svn_fetch, svn_processor),
     'BZR': (bzr_fetch, bzr_processor),
     'HG': (hg_fetch, hg_processor),

acbs/parser.py

@@ -23,7 +23,7 @@ def get_defines_file_path(location: str, stage2: bool) -> str:
         return os.path.join(location, 'defines')
 
 
-def parse_url_schema(url: str, checksum: str) -> ACBSSourceInfo:
+def parse_url_schema(url: str, checksum: str, no_gix=False) -> ACBSSourceInfo:
     acbs_source_info = ACBSSourceInfo('none', '', '')
     url_split = url.split('::', 2)
     schema = ''
@@ -51,6 +51,7 @@ def parse_url_schema(url: str, checksum: str) -> ACBSSourceInfo:
     acbs_source_info.chksum = (
         chksum_[0], chksum_[1]) if checksum != 'SKIP' else ('none', '')
     acbs_source_info.url = url_plain
+    acbs_source_info.no_gix = no_gix
     return acbs_source_info
 
 
@@ -84,12 +85,15 @@ def parse_package_url(var: Dict[str, str]) -> List[ACBSSourceInfo]:
         arch=arch.upper())) or var.get('SRCS')
     checksums = var.get('CHKSUMS__{arch}'.format(
         arch=arch.upper())) or var.get('CHKSUMS')
+    no_gix = var.get('NOGIX__{arch}'.format(
+        arch=arch.upper())) or var.get('NOGIX')
     if sources is None:
         logging.debug('Using legacy source directives')
         return [parse_package_url_legacy(var)]
     if checksums is None and not generate_mode:
         raise ValueError(
             'Missing checksums. You can use `SKIP` for VCS sources.')
+    no_gix_bool = True if no_gix else False
     sources_list = sources.strip().split()
     checksums_list = checksums.strip().split() if checksums else [
         '::'] * len(sources_list)
@@ -98,7 +102,7 @@ def parse_package_url(var: Dict[str, str]) -> List[ACBSSourceInfo]:
             f'Sources array and checksums array must have the same length (Sources: {len(sources_list)}, Checksums: {len(checksums_list)}).'
         )
     for s, c in zip(sources_list, checksums_list):
-        acbs_source_info.append(parse_url_schema(s, c))
+        acbs_source_info.append(parse_url_schema(s, c, no_gix_bool))
     return acbs_source_info