Merge pull request #198 from desultory/dev

Use the old staging area if INSTALLKERNEL_STAGING_AREA is not set, improve logging
desultory · Jan 22, 2025 · d1e0e0d · d1e0e0d
2 parents 7640c4d + 2c0391f
commit d1e0e0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/hooks/installkernel/52-ugrd.install b/hooks/installkernel/52-ugrd.install
@@ -4,7 +4,7 @@
 
 ver=${1}
 img=${2}
-initrd=${INSTALLKERNEL_STAGING_AREA}/initrd
+initrd=${INSTALLKERNEL_STAGING_AREA:-$(dirname "${img}")}/initrd
 
 # familiar helpers, we intentionally don't use Gentoo functions.sh
 die() {

diff --git a/src/ugrd/base/core.py b/src/ugrd/base/core.py
@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "4.1.0"
+__version__ = "4.1.1"
 
 from pathlib import Path
 from shutil import rmtree, which
@@ -258,8 +258,11 @@ def _process_out_file(self, out_file: str) -> None:
         return
 
     if "/" in out_file:  # If the out_file contains a path, resolve it
-        out_file = Path(out_file).resolve()
-        self.logger.info("Resolved relative output path: %s" % out_file)
+        out_file = Path(out_file)
+        resolved_out_file = out_file.resolve()
+        if resolved_out_file != out_file:
+            out_file = resolved_out_file
+            self.logger.info("Resolved relative output path: %s" % out_file)
     else:
         out_file = Path(out_file)