stage2: convert stage2 parameter to positional

Cyanoxygen · liushuyu · Cyanoxygen · commit 6090e53a3180 · 2022-11-02T14:43:55.000+08:00
To avoid logic error.

Co-Authored-By: liushuyu &lt;liushuyu001@gmail.com&gt;
diff --git a/acbs/deps.py b/acbs/deps.py
@@ -8,7 +8,7 @@
 pool: Dict[str, ACBSPackageInfo] = {}
 
 
-def tarjan_search(packages: 'OrderedDict[str, ACBSPackageInfo]', search_path: str) -> List[List[ACBSPackageInfo]]:
+def tarjan_search(packages: 'OrderedDict[str, ACBSPackageInfo]', search_path: str, stage2: bool) -> List[List[ACBSPackageInfo]]:
     """This function describes a Tarjan's strongly connected components algorithm.
     The resulting list of ACBSPackageInfo are sorted topologically as a byproduct of the algorithm
     """
@@ -23,7 +23,7 @@ def tarjan_search(packages: 'OrderedDict[str, ACBSPackageInfo]', search_path: st
     for i in packages_list:
         if index[i] == -1:  # recurse on each package that is not yet visited
             strongly_connected(search_path, packages_list, results, packages,
-                               i, lowlink, index, stackstate, stack)
+                               i, lowlink, index, stackstate, stack, stage2)
     return results
 
 
@@ -46,7 +46,7 @@ def prepare_for_reorder(package: ACBSPackageInfo, packages_list: List[str]) -> A
     return package
 
 
-def strongly_connected(search_path: str, packages_list: List[str], results: list, packages: 'OrderedDict[str, ACBSPackageInfo]', vert: str, lowlink: Dict[str, int], index: Dict[str, int], stackstate: Dict[str, bool], stack: Deque[str], depth=0):
+def strongly_connected(search_path: str, packages_list: List[str], results: list, packages: 'OrderedDict[str, ACBSPackageInfo]', vert: str, lowlink: Dict[str, int], index: Dict[str, int], stackstate: Dict[str, bool], stack: Deque[str], stage2: bool, depth=0):
     # update depth indices
     index[vert] = depth
     lowlink[vert] = depth
@@ -58,7 +58,7 @@ def strongly_connected(search_path: str, packages_list: List[str], results: list
     print(f'[{len(results) + 1}/{len(pool)}] {vert}\t\t\r', end='', flush=True)
     current_package = packages.get(vert)
     if current_package is None:
-        package = pool.get(vert) or find_package(vert, search_path)
+        package = pool.get(vert) or find_package(vert, search_path, stage2)
         if not package:
             raise ValueError(
                 f'Package {vert} not found')
diff --git a/acbs/find.py b/acbs/find.py
@@ -6,12 +6,12 @@
 from acbs.utils import make_build_dir
 
 
-def check_package_group(name: str, search_path: str, entry_path: str, stage2=False) -> Optional[List[ACBSPackageInfo]]:
+def check_package_group(name: str, search_path: str, entry_path: str, stage2: bool) -> Optional[List[ACBSPackageInfo]]:
     # is this a package group?
     if os.path.basename(entry_path) == os.path.basename(name) and os.path.isfile(os.path.join(search_path, entry_path, 'spec')):
         stub = ACBSPackageInfo(name, [], '', [ACBSSourceInfo('none', '', '')])
         stub.base_slug = entry_path
-        return expand_package_group(stub, search_path, stage2=stage2)
+        return expand_package_group(stub, search_path, stage2)
     with os.scandir(os.path.join(search_path, entry_path)) as group:
         # scan potential package groups
         for entry_group in group:
@@ -23,7 +23,7 @@ def check_package_group(name: str, search_path: str, entry_path: str, stage2=Fal
                 continue
             # because the package inside the group will have a different name than the folder name
             # we will parse the defines file to decide
-            result = parse_package(full_search_path, stage2=stage2)
+            result = parse_package(full_search_path, stage2)
             if result and result.name == name:
                 # name of the package inside the group
                 package_alias = os.path.basename(
@@ -42,12 +42,12 @@ def check_package_group(name: str, search_path: str, entry_path: str, stage2=Fal
                     group_category), root=os.path.basename(group_root))
                 result.group_seq = group_seq
                 group_result = expand_package_group(
-                    result, search_path, stage2=stage2)
+                    result, search_path, stage2)
                 return group_result
     return None
 
 
-def find_package(name: str, search_path: str, stage2=False) -> List[ACBSPackageInfo]:
+def find_package(name: str, search_path: str, stage2: bool) -> List[ACBSPackageInfo]:
     if os.path.isfile(os.path.join(search_path, name)):
         with open(os.path.join(search_path, name), 'rt') as f:
             content = f.read()
@@ -59,23 +59,23 @@ def find_package(name: str, search_path: str, stage2=False) -> List[ACBSPackageI
             p = p.strip()
             if not p or p.startswith('#'):
                 continue
-            found = find_package_inner(p, search_path, stage2=stage2)
+            found = find_package_inner(p, search_path, stage2)
             if not found:
                 raise RuntimeError(
                     f'Package {p} requested in {name} was not found.')
             results.extend(found)
         print()
         return results
-    return find_package_inner(name, search_path, stage2=stage2)
+    return find_package_inner(name, search_path, stage2)
 
 
-def find_package_inner(name: str, search_path: str, group=False, stage2=False) -> List[ACBSPackageInfo]:
+def find_package_inner(name: str, search_path: str, stage2: bool, group=False) -> List[ACBSPackageInfo]:
     if os.path.isdir(os.path.join(search_path, name)):
         flat_path = os.path.join(search_path, name, 'autobuild')
         if os.path.isdir(flat_path):
-            return [parse_package(os.path.join(search_path, name, 'autobuild'), stage2=stage2)]
+            return [parse_package(os.path.join(search_path, name, 'autobuild'), stage2)]
         # is this a package group?
-        group_result = check_package_group(name, search_path, name, stage2=stage2)
+        group_result = check_package_group(name, search_path, name, stage2)
         if group_result:
             return group_result
     with os.scandir(search_path) as it:
@@ -91,12 +91,12 @@ def find_package_inner(name: str, search_path: str, group=False, stage2=False) -
                     full_search_path = os.path.join(
                         search_path, entry.name, entry_inner.name, 'autobuild')
                     if entry_inner.name == name and os.path.isdir(full_search_path):
-                        return [parse_package(full_search_path, stage2=stage2)]
+                        return [parse_package(full_search_path, stage2)]
                     if not group:
                         continue
                     # is this a package group?
                     group_result = check_package_group(
-                        name, search_path, os.path.join(entry.name, entry_inner.name), stage2=stage2)
+                        name, search_path, os.path.join(entry.name, entry_inner.name), stage2)
                     if group_result:
                         return group_result
     if group:
@@ -124,7 +124,7 @@ def check_package_groups(packages: List[ACBSPackageInfo]):
             groups_seen[base_slug] = pkg.group_seq
 
 
-def expand_package_group(package: ACBSPackageInfo, search_path: str, stage2=False) -> List[ACBSPackageInfo]:
+def expand_package_group(package: ACBSPackageInfo, search_path: str, stage2: bool) -> List[ACBSPackageInfo]:
     group_root = os.path.join(search_path, package.base_slug)
     original_base = package.base_slug
     actionables: List[ACBSPackageInfo] = []
@@ -138,7 +138,7 @@ def expand_package_group(package: ACBSPackageInfo, search_path: str, stage2=Fals
                 'Malformed sub-package name: {name}'.format(name=entry.name))
         try:
             sequence = int(splitted[0])
-            package = parse_package(entry.path, stage2=stage2)
+            package = parse_package(entry.path, stage2)
             if package:
                 package.base_slug = original_base
                 package.group_seq = sequence
diff --git a/acbs/main.py b/acbs/main.py
@@ -104,7 +104,7 @@ def build(self) -> None:
             if not package:
                 raise RuntimeError(f'Could not find package {i}')
             packages.extend(package)
-        resolved = self.resolve_deps(packages)
+        resolved = self.resolve_deps(packages, self.stage2)
         if not packages:
             logging.info('Nothing to do after dependency resolution')
             return
@@ -134,7 +134,7 @@ def save_checkpoint(self, build_timings, packages):
         raise RuntimeError(
             f'Build error.\nUse `acbs-build --resume {filename}` to resume after you sorted out the situation.')
 
-    def reorder_deps(self, packages):
+    def reorder_deps(self, packages, stage2: bool):
         logging.info('Re-ordering packages...')
         new_packages = []
         package_names = [p.name for p in packages]
@@ -143,7 +143,7 @@ def reorder_deps(self, packages):
             logging.debug(f'Prepare for re-ordering: {pkg.name}')
             new_packages.append(prepare_for_reorder(pkg, package_names))
         graph = get_deps_graph(new_packages)
-        return tarjan_search(graph, self.tree_dir)
+        return tarjan_search(graph, self.tree_dir, stage2)
 
     def filter_unbuildable(self, packages: List[ACBSPackageInfo]) -> List[ACBSPackageInfo]:
         unbuildable = []
@@ -157,7 +157,7 @@ def filter_unbuildable(self, packages: List[ACBSPackageInfo]) -> List[ACBSPackag
             logging.warning(f'The following packages will be skipped as they are not buildable:\n\t{(" ".join(unbuildable))}')
         return buildable
 
-    def resolve_deps(self, packages):
+    def resolve_deps(self, packages, stage2: bool):
         error = False
         if not self.no_deps:
             logging.debug('Filtering packages...')
@@ -167,7 +167,7 @@ def resolve_deps(self, packages):
             logging.debug('Converting queue into adjacency graph...')
             graph = get_deps_graph(packages)
             logging.debug('Running Tarjan search...')
-            resolved = tarjan_search(graph, self.tree_dir)
+            resolved = tarjan_search(graph, self.tree_dir, stage2)
             # re-order the packages
             if self.reorder:
                 print()
diff --git a/acbs/parser.py b/acbs/parser.py
@@ -13,7 +13,7 @@
 generate_mode = False
 
 
-def get_defines_file_path(location: str, stage2: bool=False) -> str:
+def get_defines_file_path(location: str, stage2: bool) -> str:
     '''
     Return ${location}/defines or ${location}/defines.stage2 depending on the value of stage2 and whether the .stage2 file exists.
     '''
@@ -135,7 +135,7 @@ def parse_package_url_legacy(var: Dict[str, str]) -> ACBSSourceInfo:
     return acbs_source_info
 
 
-def parse_package(location: str, stage2=False) -> ACBSPackageInfo:
+def parse_package(location: str, stage2: bool) -> ACBSPackageInfo:
     logging.debug('Parsing {}...'.format(location))
     # Call a helper function to check if there's a stage2 defines automatically
     defines_location = get_defines_file_path(location, stage2)
diff --git a/acbs/resume.py b/acbs/resume.py
@@ -57,6 +57,7 @@ def resume_build():
 
     state = do_load_checkpoint(filename)
     builder = BuildCore(args)
+    stage2 = builder.stage2
     logging.info('Resuming from {}'.format(filename))
     if state.version != __version__:
         logging.warning(
@@ -83,7 +84,7 @@ def resume_build():
         # the spec files changed
         if index < new_cursor:
             new_cursor = index
-        resumed_packages.extend(find_package(p.name, builder.tree_dir))
+        resumed_packages.extend(find_package(p.name, builder.tree_dir, stage2))
         # index doesn't matter now, since changes have been detected
     if not check_dpkg_state(state, resumed_packages[:new_cursor]):
         name = checkpoint_to_group(
