Merge branch 'benh/version-sort'

This commit is contained in:
Ben Hutchings 2015-12-10 17:21:23 +00:00
commit df86688b1e
2 changed files with 2 additions and 22 deletions

2
debian/control vendored
View File

@ -11,7 +11,7 @@ Vcs-Git: https://anonscm.debian.org/git/kernel/initramfs-tools.git
Package: initramfs-tools
Architecture: all
Multi-Arch: foreign
Depends: initramfs-tools-core, ${misc:Depends}
Depends: initramfs-tools-core, linux-base, ${misc:Depends}
Suggests: bash-completion
Provides: linux-initramfs-tool
Conflicts: linux-initramfs-tool, usplash (<< 0.5.50)

View File

@ -230,27 +230,7 @@ ro_boot_check()
get_sorted_versions()
{
version_list=""
for gsv_x in "${STATEDIR}"/*; do
gsv_x="$(basename "${gsv_x}")"
if [ "${gsv_x}" = '*' ]; then
return 0
fi
worklist=""
for gsv_i in $version_list; do
if dpkg --compare-versions "${gsv_x}" '>' "${gsv_i}" 2>/dev/null; then
worklist="${worklist} ${gsv_x} ${gsv_i}"
gsv_x=""
else
worklist="${worklist} ${gsv_i}"
fi
done
if [ "${gsv_x}" != "" ]; then
worklist="${worklist} ${gsv_x}"
fi
version_list="${worklist}"
done
version_list="$(ls -1 "${STATEDIR}" | linux-version sort --reverse)"
verbose "Available versions: ${version_list}"
}