fixed mode setting for mknods from cmdline, moved inode logic to the archive class

Signed-off-by: Zen <[email protected]>

Author: desultory

src/pycpio/cpio/archive.py

@@ -14,7 +14,13 @@ class CPIOArchive(dict):
     def __setitem__(self, name, value):
         if name in self:
             raise AttributeError("Entry already exists: %s" % name)
+        if value.header.ino in self.inodes:
+            from .common import get_new_inode
+            self.logger.debug("Inode already exists: %s", value.header.ino)
+            value.header.ino = get_new_inode(self.inodes)
+            self.logger.debug("New inode: %s", value.header.ino)
         super().__setitem__(name, value)
+        self.inodes.add(value.header.ino)
 
     def __contains__(self, name):
         """ Check if an entry exists in the archive """
@@ -23,6 +29,7 @@ def __contains__(self, name):
     def __init__(self, structure=HEADER_NEW, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.structure = structure
+        self.inodes = set()
 
     def pop(self, name):
         """ Remove an entry from the archive """

src/pycpio/cpio/data.py

@@ -35,8 +35,6 @@ def from_dir(path: Path, parent=None, relative=None, *args, **kwargs):
 
         data = []
         data.append(CPIOData.from_path(path=path, relative=relative, *args, **kwargs))
-        if logger := kwargs.get('logger'):
-            logger.warning(data[0])
         for child in path.iterdir():
             if parent:
                 child_path = parent / child

src/pycpio/pycpio.py

@@ -44,9 +44,9 @@ def add_symlink(self, name: str, target: str):
         """ Adds a symlink to the CPIO archive. """
         self._build_cpio_entry(name=name, entry_type=CPIOModes['Symlink'].value, data=target)
 
-    def add_chardev(self, name: str, major: int, minor: int):
+    def add_chardev(self, name: str, major: int, minor: int, *args, **kwargs):
         """ Adds a character device to the CPIO archive. """
-        self._build_cpio_entry(name=name, entry_type=CPIOModes['CharDev'].value, rdevmajor=major, rdevminor=minor)
+        self._build_cpio_entry(name=name, entry_type=CPIOModes['CharDev'].value, rdevmajor=major, rdevminor=minor, *args, **kwargs)
 
     def read_cpio_file(self, file_path: Path):
         """ Creates a CPIOReader object and reads the file. """
@@ -64,12 +64,16 @@ def list_files(self):
         """ Returns a list of files in the CPIO archive. """
         return '\n'.join([name for name in self.entries.keys()])
 
-    def _build_cpio_entry(self, name: str, entry_type: CPIOModes, data=None, **kwargs):
+    def _build_cpio_entry(self, name: str, entry_type: CPIOModes, data=None, *args, **kwargs):
         """ Creates a CPIOData object and adds it to the CPIO archive. """
+        overrides = self.overrides.copy()
+        if mode := kwargs.pop('mode', None):
+            overrides['mode'] = mode
+            self.logger.info("Setting override: mode=%s" % mode)
         kwargs = {'name': name, 'structure': self.structure, 'mode': entry_type, 'data': data,
-                  'overrides': self.overrides, 'logger': self.logger, '_log_init': False, **kwargs}
+                  'overrides': overrides, 'logger': self.logger, '_log_init': False, **kwargs}
 
-        self.entries.add_entry(CPIOData.create_entry(**kwargs))
+        self.entries.add_entry(CPIOData.create_entry(*args, **kwargs))
 
     def __str__(self):
         return "\n".join([str(f) for f in self.entries.values()])

src/pycpio/writer/writer.py

@@ -1,7 +1,7 @@
 
 from zenlib.logging import loggify
 
-from pycpio.cpio import pad_cpio, get_new_inode
+from pycpio.cpio import pad_cpio
 from pycpio.header import CPIOHeader, HEADER_NEW
 
 from pathlib import Path
@@ -33,9 +33,7 @@ def write(self):
                 # That class manages the CPIOData objects, as well as duplicate detection
                 # If data is passed to the writer, it should try to write it
                 if entry.header.ino in inodes:
-                    self.logger.warning(f"Duplicate inode: {entry.header.ino}")
-                    entry.header.ino = get_new_inode(inodes)
-                    self.logger.info(f"New inode: {entry.header.ino}")
+                    raise ValueError(f"Duplicate inode: {entry.header.ino}")
                 inodes.add(entry.header.ino)
 
                 entry_bytes = bytes(entry)