From 29e1914ca18f460c4c280ffa957f6400517baf23 Mon Sep 17 00:00:00 2001
From: InsanePrawn <insane.prawny@gmail.com>
Date: Thu, 5 Aug 2021 13:13:03 +0200
Subject: [PATCH] Simplify cmd_build()

Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
---
 packages.py | 51 +++++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/packages.py b/packages.py
index eea61fa..1cdc143 100644
--- a/packages.py
+++ b/packages.py
@@ -358,38 +358,33 @@ def cmd_build(verbose, path):
     check_prebuilts()
 
     if path == 'all':
-        packages = generate_package_order(discover_packages())
-        need_build = []
-
-        for package in packages:
-            update_package_version_and_sources(package)
-            if not check_package_version_built(package):
-                need_build.append(package)
-
-        if len(need_build) == 0:
-            logging.info('Everything built already')
-            return
-        logging.info('Building %s', ', '.join(
-            map(lambda x: x.path, need_build)))
-        with open('.last_built', 'w') as file:
-            file.write('\n'.join(
-                map(lambda x: x.path, need_build)))
-
-        for package in need_build:
-            setup_chroot()
-            setup_dependencies_and_sources(package)
-            build_package(package)
-            add_package_to_repo(package)
+        packages = discover_packages()
     else:
         package = Package(path)
+        packages = package.local_depends + [package]
+
+    package_order = generate_package_order(packages)
+    need_build = []
+    for package in package_order:
         update_package_version_and_sources(package)
         if not check_package_version_built(package):
-            with open('.last_built', 'w') as file:
-                file.write(package.path)
-            setup_chroot()
-            setup_dependencies_and_sources(package)
-            build_package(package)
-            add_package_to_repo(package)
+            need_build.append(package)
+
+    if len(need_build) == 0:
+        logging.info('Everything built already')
+        return
+    logging.info('Building %s', ', '.join(
+        map(lambda x: x.path, need_build)))
+    with open('.last_built', 'w') as file:
+        file.write('\n'.join(
+            map(lambda x: x.path, need_build)))
+
+    for package in need_build:
+        setup_chroot()
+        setup_dependencies_and_sources(package)
+        build_package(package)
+        add_package_to_repo(package)
+
 
 
 @click.command(name='clean')