drop self.files

openwrt · Nov 13, 2022 · 842219e · 842219e
1 parent 08ad2f3
commit 842219e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/asu/build.py b/asu/build.py
@@ -148,7 +148,7 @@ def report_error(msg):
         req["profile"],
         req["packages"],
         packages_hash,
-        defaults=req.get("defaults"),
+        defaults=req.get("defaults", ""),
         filesystem=req.get("filesystem"),
     )
 

diff --git a/asu/imagebuilder.py b/asu/imagebuilder.py
@@ -103,7 +103,6 @@ def __init__(
         self.default_packages = set()
         self.profile_packages = set()
         self.bin_dir = bin_dir
-        self.files = files or self.bin_dir
         self.custom_public_key = custom_public_key
         self.stdout = ""
         self.stderr = ""
@@ -361,12 +360,12 @@ def build(
             f"BIN_DIR={self.bin_dir}",
         ]
 
-        defaults_file = self.files / "files/etc/uci-defaults/99-asu-defaults"
+        defaults_file = self.bin_dir / "files/etc/uci-defaults/99-asu-defaults"
 
         if defaults:
-            defaults_file.parent.mkdir(parents=True)
+            defaults_file.parent.mkdir(parents=True, exist_ok=True)
             defaults_file.write_text(defaults)
-            self.build_cmd.append(f"FILES={self.files / 'files'}")
+            self.build_cmd.append(f"FILES={self.bin_dir / 'files'}")
         else:
             defaults_file.unlink(missing_ok=True)
 

diff --git a/tests/test_common.py b/tests/test_common.py
@@ -43,4 +43,4 @@ def test_get_request_hash_diff_packages():
         "diff_packages": True,
     }
 
-    assert get_request_hash(request) == "caaa8f25efadb5456f8fd32b5a4ba032"
+    assert get_request_hash(request) == "bad147b0ce42839028fd02c7d5d3d79e"