projects/aports·commit ad777448

abuild: deal with duplicate provides

ad777448 · Natanael Copa <[email protected]> · 2012-10-30 15:19:12 +00:00

- remove duplicate provides with so version 0
- exit with error if there are multiple provides with different versions
Commit
ad777448b349e5120083e9cfcf550c135c4af0f6
Parents
f640500e

Changes

1 files changed · +10 −1

FileStatusAddDelContent
abuild.inmodified+10−1View file

abuild.in

View file
diff --git a/abuild.in b/abuild.in
index 62a860f..175c227 100755
--- a/abuild.in
+++ b/abuild.in
@@ -992,7 +992,16 @@ scan_shared_objects() {
esac
list_has "$soname" $somask && continue
echo "$soname $sover"
- done | sort -u > "$controldir"/.provides-so
+ # use awk to filter out dupes that has sover = 0
+ done | awk '{ if (so[$1] == 0) so[$1] = $2; }
+ END { for (i in so) print(i " " so[i]); }' \
+ | sort -u > "$controldir"/.provides-so
+
+ # verify that we dont have any duplicates
+ local dupes="$(cut -d' ' -f1 "$controldir"/.provides-so | uniq -d)"
+ if [ -n "$dupes" ]; then
+ die "provides multiple versions of same shared object: $dupes"
+ fi
# now find the so dependencies
scanelf --nobanner --recursive --needed "$datadir" | tr ' ' ':' \