Commit 435a2668 authored by intrigeri's avatar intrigeri
Browse files

tails-diff-suites: sort package lists before comparing.

That's particularly needed when --iso is passed: we're comparing list
of packages that are built from different sources.
parent adc76807
#!/bin/sh
#!/bin/bash
set -e
set -u
......@@ -112,6 +112,10 @@ packages_in_iso() {
packages_in_suites $overlays
}
sort_packages_list() {
sort --key=1 | sort --key=2
}
### Sanity checks
[ -n "$OLD" ] || error "$USAGE"
......@@ -147,7 +151,8 @@ case "$MODE" in
error "Unsupported mode: '$MODE'"
esac
if ! diff -Naur "$OLDLIST" "$NEWLIST" ; then
if ! diff -Naur <(cat "$OLDLIST" | sort_packages_list) \
<(cat "$NEWLIST" | sort_packages_list) ; then
RET=$?
case "$RET" in
1)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment