dissect.volume 3.11.dev2__tar.gz → 3.12.dev1__tar.gz

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/.gitattributes

@@ -43,6 +43,4 @@ tests/data/ddf/ddf-raid10-1.bin.gz filter=lfs diff=lfs merge=lfs -text
 tests/data/ddf/ddf-raid10-2.bin.gz filter=lfs diff=lfs merge=lfs -text
 tests/data/ddf/ddf-raid10-3.bin.gz filter=lfs diff=lfs merge=lfs -text
 tests/data/ddf/ddf-raid10-4.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/lvm-thin.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/lvm-mirror-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/lvm-mirror-1.bin.gz filter=lfs diff=lfs merge=lfs -text
+tests/data/lvm/* filter=lfs diff=lfs merge=lfs -text

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.volume
-Version: 3.11.dev2
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,7 +22,7 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/dissect/volume/lvm/metadata.py

@@ -342,7 +342,12 @@ class StripedSegment(Segment):
         offset = 0
         for pv_name, extent_offset in self.stripes:
             if pv_name not in opened_pv:
-                pv_fh = pv[pv_name].dev.open()
+                if (pv_dev := pv[pv_name].dev) is not None:
+                    pv_fh = pv_dev.open()
+                else:
+                    raise LVM2Error(
+                        f"Physical volume not found: {pv_name} (id={pv[pv_name].id}, device={pv[pv_name].device})"
+                    )
                 opened_pv[pv_name] = pv_fh
             else:
                 pv_fh = opened_pv[pv_name]

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/dissect.volume.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.volume
-Version: 3.11.dev2
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,7 +22,7 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/dissect.volume.egg-info/SOURCES.txt

@@ -58,10 +58,6 @@ tests/data/gpt_4k.bin
 tests/data/gpt_esxi.bin
 tests/data/gpt_hybrid.bin
 tests/data/gpt_no_name_xff.bin
-tests/data/lvm-mirror-1.bin.gz
-tests/data/lvm-mirror-2.bin.gz
-tests/data/lvm-thin.bin.gz
-tests/data/lvm.bin.gz
 tests/data/mbr.bin
 tests/data/ddf/ddf-raid0-1.bin.gz
 tests/data/ddf/ddf-raid0-2.bin.gz
@@ -85,6 +81,10 @@ tests/data/ddf/ddf-raid6-3.bin.gz
 tests/data/ddf/ddf-raid6-4.bin.gz
 tests/data/dm/dm-thin-data.bin.gz
 tests/data/dm/dm-thin-metadata.bin.gz
+tests/data/lvm/lvm-mirror-1.bin.gz
+tests/data/lvm/lvm-mirror-2.bin.gz
+tests/data/lvm/lvm-thin.bin.gz
+tests/data/lvm/lvm.bin.gz
 tests/data/md/md-90-1.bin.gz
 tests/data/md/md-90-2.bin.gz
 tests/data/md/md-90-raid1-1.bin.gz

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/dissect.volume.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dissect.cstruct<5,>=4.dev
+dissect.cstruct<5,>=4
 dissect.util<4,>3
 
 [dev]

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=4.dev,<5",
+    "dissect.cstruct>=4,<5",
     "dissect.util>3,<4",
 ]
 dynamic = ["version"]

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/tests/conftest.py

@@ -27,17 +27,17 @@ def open_files_gz(names: list[str], mode: str = "rb") -> Iterator[list[gzip.Gzip
 
 @pytest.fixture
 def lvm() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/lvm.bin.gz")
+    yield from open_file_gz("data/lvm/lvm.bin.gz")
 
 
 @pytest.fixture
 def lvm_thin() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/lvm-thin.bin.gz")
+    yield from open_file_gz("data/lvm/lvm-thin.bin.gz")
 
 
 @pytest.fixture
 def lvm_mirror() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/lvm-mirror-1.bin.gz", "data/lvm-mirror-2.bin.gz"])
+    yield from open_files_gz(["data/lvm/lvm-mirror-1.bin.gz", "data/lvm/lvm-mirror-2.bin.gz"])
 
 
 @pytest.fixture

{dissect_volume-3.11.dev2 → dissect_volume-3.12.dev1}/tests/test_lvm.py

@@ -1,4 +1,5 @@
 import io
+import re
 from typing import BinaryIO
 
 import pytest
@@ -33,6 +34,15 @@ def test_lvm(lvm: BinaryIO) -> None:
     assert fh.read(1024) == b"\xde\xad\xbe\xef" * 256
     assert fh.read(1024) == b"\x00" * 1024
 
+    vg.pv[0]._dev = None
+    with pytest.raises(
+        LVM2Error,
+        match=re.escape(
+            "Physical volume not found: pv0 (id=2Svcy0-cRH2-3Xrz-87Fv-zNUI-9CoI-Ycoyql, device=/dev/loop1)"
+        ),
+    ):
+        fh = lv.open()
+
 
 def test_lvm_invalid() -> None:
     buf = io.BytesIO(4096 * b"\x00")