From 7d930f8f6cf33fa482aa8d13c81fbc18194acce1 Mon Sep 17 00:00:00 2001 From: purian23 Date: Thu, 22 Oct 2026 06:06:38 -0400 Subject: [PATCH] distos: compare ubuntu published commit by prefix (cherry picked from commit 39a58f77ec302d5e8aa4159bbc571cdfdc48f449) --- distro/scripts/ppa-sync-plan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distro/scripts/ppa-sync-plan.sh b/distro/scripts/ppa-sync-plan.sh index 5809fc609..db68e0400 100755 --- a/distro/scripts/ppa-sync-plan.sh +++ b/distro/scripts/ppa-sync-plan.sh @@ -100,7 +100,7 @@ include_package() { [[ "$PACKAGE_FILTER" == "all" || "$PACKAGE_FILTER" == "$package" ]] } -CURRENT_COMMIT="$(git rev-parse --short=8 HEAD)" +CURRENT_COMMIT="$(git rev-parse HEAD)" LATEST_TAG="" TARGETS=() @@ -118,9 +118,9 @@ for pkg_info in "${PACKAGES[@]}"; do reason="missing from ${series}" elif [[ "$type" == "git" ]]; then ppa_commit="$(embedded_commit "$ppa_version")" - if [[ "$ppa_commit" != "$CURRENT_COMMIT" ]]; then + if [[ -z "$ppa_commit" || "${CURRENT_COMMIT:0:${#ppa_commit}}" != "$ppa_commit" ]]; then needs_update=true - reason="commit ${ppa_commit:-none} -> ${CURRENT_COMMIT}" + reason="commit ${ppa_commit:-none} -> ${CURRENT_COMMIT:0:9}" fi else if [[ -z "$LATEST_TAG" ]]; then