diff options
| -rwxr-xr-x | web/update | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -207,14 +207,19 @@ echo -n "Comparing versions... " for PACKAGE in ${DOWNSTREAM_PACKAGES} do DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }')" - #UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.indices | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" - # upstream_source_version = highest version of (upstream_source_versions + upstream_binary_versions) - UPSTREAM_VERSION="$(grep -A2 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | awk '/^Version: / { print $2 }') $(for BINARY in $(grep -A1 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | grep '^Binary:' | cut -d: -f 2- | sed -e 's|,||g'); do grep -A2 "^Package: ${BINARY}\$" upstream.${MODE}.binaries ; done | awk '/^Version: / { print $2 }')" - UPSTREAM_VERSION="$(echo ${UPSTREAM_VERSION} | sed -e 's| |\n|g' | sort -rV | head -n1)" - -# FIXME -#for B in $(grep -A1 '^Package: lzlib$' upstream.fuchur.sources | awk -F: '/^Binary: / { print $2 }' | sed -e 's|,||g'); do grep -A2 "^Package: $B\$" upstream.fuchur.binaries ; done | awk -F: '/^Version: / { print $2 }' | sort -rV | head -n1 + case "${MODE}" in + *-backports) + # ignore BinNMUs + UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.sources | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" + ;; + + *) + # upstream_source_version = highest version of (upstream_source_versions + upstream_binary_versions) + UPSTREAM_VERSION="$(grep -A2 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | awk '/^Version: / { print $2 }') $(for BINARY in $(grep -A1 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | grep '^Binary:' | cut -d: -f 2- | sed -e 's|,||g'); do grep -A2 "^Package: ${BINARY}\$" upstream.${MODE}.binaries ; done | awk '/^Version: / { print $2 }')" + UPSTREAM_VERSION="$(echo ${UPSTREAM_VERSION} | sed -e 's| |\n|g' | sort -rV | head -n1)" + ;; + esac if echo ${UPSTREAM_VERSION} | grep -qs '-' then |