mirror of
https://github.com/xroche/httrack.git
synced 2026-06-29 13:35:17 +03:00
Compare commits
2 Commits
fix-pause-
...
debian-3.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
141d065a04 | ||
|
|
f9ee4702a2 |
44
.github/workflows/ci.yml
vendored
44
.github/workflows/ci.yml
vendored
@@ -61,6 +61,50 @@ jobs:
|
||||
if: failure()
|
||||
run: cat tests/test-suite.log 2>/dev/null || true
|
||||
|
||||
# Reproduce the Debian buildds: they build in a minimal chroot with no
|
||||
# python3, so the local-server tests must SKIP (exit 77), not fail. GitHub
|
||||
# runners ship python3, so every other job hides this path; here we remove it
|
||||
# before `make check`. This is the guard that would have caught the 3.49.10-1
|
||||
# FTBFS (28_local-pause failed instead of skipping when python3 was absent).
|
||||
buildd-no-python3:
|
||||
name: build (no python3, Debian buildd)
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Install build dependencies
|
||||
run: |
|
||||
set -euo pipefail
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --no-install-recommends \
|
||||
build-essential autoconf automake libtool autoconf-archive \
|
||||
zlib1g-dev libssl-dev
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
set -euo pipefail
|
||||
autoreconf -fi
|
||||
./configure
|
||||
|
||||
- name: Build
|
||||
run: make -j"$(nproc)"
|
||||
|
||||
- name: Test without python3
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# Hide every python3* so `command -v python3` fails like it does in the
|
||||
# buildd chroot; masking with /bin/false would still resolve.
|
||||
sudo find /usr/bin /usr/local/bin -maxdepth 1 -name 'python3*' \
|
||||
-exec mv {} {}.hidden \;
|
||||
! command -v python3
|
||||
make check
|
||||
|
||||
- name: Print the test log on failure
|
||||
if: failure()
|
||||
run: cat tests/test-suite.log 2>/dev/null || true
|
||||
|
||||
# Portability: build and test on macOS (Darwin/clang) on a native runner --
|
||||
# no VM. The tree has no __APPLE__ branches, so Darwin exercises the
|
||||
# generic-Unix path on a second libc and kernel. brew's openssl@3 is keg-only,
|
||||
|
||||
9
debian/changelog
vendored
9
debian/changelog
vendored
@@ -1,3 +1,12 @@
|
||||
httrack (3.49.10-2) unstable; urgency=medium
|
||||
|
||||
* Fix FTBFS: tests/28_local-pause failed instead of skipping when python3 is
|
||||
absent (the local-server tests need python3, which the buildds lack). Add
|
||||
patches/skip-local-pause-test-without-python3.patch to guard the test on
|
||||
python3 up front, like its siblings, so it skips cleanly.
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Sun, 28 Jun 2026 20:18:46 +0200
|
||||
|
||||
httrack (3.49.10-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release: new download-pacing and URL-handling options plus a
|
||||
|
||||
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
@@ -0,0 +1 @@
|
||||
skip-local-pause-test-without-python3.patch
|
||||
29
debian/patches/skip-local-pause-test-without-python3.patch
vendored
Normal file
29
debian/patches/skip-local-pause-test-without-python3.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
Description: skip 28_local-pause when python3 is absent (fixes FTBFS on buildds)
|
||||
The local-server tests skip (exit 77) when python3 is missing, but
|
||||
28_local-pause wrapped local-crawl.sh in a command substitution that swallowed
|
||||
that skip. On the python3-less buildd chroot the test then ran serverless, both
|
||||
crawls finished in 0s, and the 0s delta was reported as a failure. Guard the
|
||||
test on python3 up front, like its siblings, so it skips cleanly.
|
||||
Author: Xavier Roche <roche@httrack.com>
|
||||
Origin: upstream, https://github.com/xroche/httrack/pull/445
|
||||
Applied-Upstream: https://github.com/xroche/httrack/commit/45279d7
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2026-06-28
|
||||
diff --git a/tests/28_local-pause.test b/tests/28_local-pause.test
|
||||
index 8505a75..add95d1 100755
|
||||
--- a/tests/28_local-pause.test
|
||||
+++ b/tests/28_local-pause.test
|
||||
@@ -9,6 +9,13 @@ set -e
|
||||
|
||||
: "${top_srcdir:=..}"
|
||||
|
||||
+# python3 runs the local server (mirror local-crawl.sh); skip when absent, else
|
||||
+# run() swallows its exit-77 and the serverless 0s/0s crawl looks like a fail.
|
||||
+command -v python3 >/dev/null || {
|
||||
+ echo "python3 not found; skipping local crawl tests"
|
||||
+ exit 77
|
||||
+}
|
||||
+
|
||||
run() { # echoes the wall-clock seconds of one crawl
|
||||
local t0 t1
|
||||
t0=$(date +%s)
|
||||
@@ -9,6 +9,13 @@ set -e
|
||||
|
||||
: "${top_srcdir:=..}"
|
||||
|
||||
# python3 runs the local server (mirror local-crawl.sh); skip when absent, else
|
||||
# run() swallows its exit-77 and the serverless 0s/0s crawl looks like a fail.
|
||||
command -v python3 >/dev/null || {
|
||||
echo "python3 not found; skipping local crawl tests"
|
||||
exit 77
|
||||
}
|
||||
|
||||
run() { # echoes the wall-clock seconds of one crawl
|
||||
local t0 t1
|
||||
t0=$(date +%s)
|
||||
|
||||
Reference in New Issue
Block a user