annet 0.9__tar.gz → 0.11__tar.gz

{annet-0.9/annet.egg-info → annet-0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.9
+Version: 0.11
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.9 → annet-0.11}/annet/annlib/jsontools.py

@@ -92,7 +92,11 @@ def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
 def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str, Any]:
     result = {}
     for f in filters:
-        pointer = jsonpointer.JsonPointer(f)
+        filter_text = f.strip()
+        if not filter_text:
+            continue
+
+        pointer = jsonpointer.JsonPointer(filter_text)
 
         try:
             part = pointer.get(copy.deepcopy(content))
@@ -103,7 +107,7 @@ def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str,
                     sub_tree[i] = {}
                 sub_tree = sub_tree[i]
 
-            patch = jsonpatch.JsonPatch([{"op": "add", "path": f, "value": part}])
+            patch = jsonpatch.JsonPatch([{"op": "add", "path": filter_text, "value": part}])
             result = patch.apply(result)
         except jsonpointer.JsonPointerException:
             # no value found in content by the pointer, skip the ACL item

{annet-0.9 → annet-0.11}/annet/gen.py

@@ -245,28 +245,27 @@ def _old_new_per_device(ctx: OldNewDeviceContext, device: Device, filterer: Filt
             filters = filters_text.split("\n")
 
             for file_name in new_json_fragment_files:
-                new_json_fragment_files = _update_json_config(
-                    new_json_fragment_files,
-                    file_name,
-                    jsontools.apply_acl_filters(new_json_fragment_files[file_name][0], filters)
-                )
+                if new_json_fragment_files.get(file_name) is not None:
+                    new_json_fragment_files = _update_json_config(
+                        new_json_fragment_files,
+                        file_name,
+                        jsontools.apply_acl_filters(new_json_fragment_files[file_name][0], filters)
+                    )
             for file_name in old_json_fragment_files:
-                old_json_fragment_files = _update_json_config(
-                    old_json_fragment_files,
-                    file_name,
-                    jsontools.apply_acl_filters(old_json_fragment_files[file_name][0], filters)
-                )
+                if old_json_fragment_files.get(file_name) is not None:
+                    old_json_fragment_files[file_name] = jsontools.apply_acl_filters(old_json_fragment_files[file_name], filters)
 
         if ctx.args.acl_safe:
             safe_new_files = res.new_files(safe=True)
             safe_new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files, safe=True)
             if filters:
                 for file_name in safe_new_json_fragment_files:
-                    safe_new_json_fragment_files = _update_json_config(
-                        safe_new_json_fragment_files,
-                        file_name,
-                        jsontools.apply_acl_filters(safe_new_json_fragment_files[file_name][0], filters)
-                    )
+                    if safe_new_json_fragment_files.get(file_name):
+                        safe_new_json_fragment_files = _update_json_config(
+                            safe_new_json_fragment_files,
+                            file_name,
+                            jsontools.apply_acl_filters(safe_new_json_fragment_files[file_name][0], filters)
+                        )
 
     if ctx.args.profile:
         perf = res.perf_mesures()

{annet-0.9 → annet-0.11}/annet/generators/__init__.py

@@ -500,6 +500,7 @@ def _run_json_fragment_generator(
     logger = get_logger(generator=_make_generator_ctx(gen))
     if not gen.supports_device(device):
         logger.info("generator %s is not supported for device %s", gen, device.hostname)
+        return
 
     path = gen.path(device)
     if not path:

{annet-0.9 → annet-0.11/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.9
+Version: 0.11
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT