Fix a few build and test related issues in 0.33.x

[Rob Browning]

All are cherry-picked from main.

--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4

[Rob Browning]

Thanks to Greg Troxel for reporting the issue.

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
(cherry picked from commit 068295b2b87f27597105a36942df5b58dbd038ba)
---
dev/cleanup-mounts-under | 2 ++
1 file changed, 2 insertions(+)

diff --git a/dev/cleanup-mounts-under b/dev/cleanup-mounts-under
index 377e3a95..a6d072c0 100755
--- a/dev/cleanup-mounts-under
+++ b/dev/cleanup-mounts-under
@@ -4,6 +4,8 @@
set -e
for python in \
python3 \
+ python3.14 \
+ python3.13 \
python3.12 \
python3.11 \
python3.10 \
--
2.47.3

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>

(cherry picked from commit c5aee84c177363a01b5810d4212e009fb070b85f)
---
dev/sparse-size | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/sparse-size b/dev/sparse-size
index ebb9c409..13aae7f5 100755
--- a/dev/sparse-size
+++ b/dev/sparse-size
@@ -73,11 +73,12 @@ with open(opt.path, 'rb') as f:
try:
new_off = lseek(fd, off, SEEK_DATA)
except OSError as ex:
- if ex.errno == ENXIO:
- if opt.verbose:
- log(f'hole: {end - off} @ {off}\n')
- sparse += end - off
- break
+ if ex.errno != ENXIO:
+ raise ex
+ if opt.verbose:
+ log(f'hole: {end - off} @ {off}\n')
+ sparse += end - off
+ break
if opt.verbose:
log(f'hole: {new_off - off} @ {off}\n')
sparse += new_off - off
--
2.47.3