summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-04 15:10:00 +0200
committerErich Eckner <git@eckner.net>2018-09-04 15:10:00 +0200
commit122575e94563705ec0b7227fb6afbd53f5244405 (patch)
tree2b207c4cd2f875cf652ec9c4ea1530cfcbcd97ae
parente8989364d703974ce2b968a0c2f2249a61f423f2 (diff)
downloadbuilder-122575e94563705ec0b7227fb6afbd53f5244405.tar.xz
lib/mysql-functions, bin/return-assignment: do not add "<=\infty" dependency - ">=0" dependency is already enough
-rwxr-xr-xbin/return-assignment12
-rwxr-xr-xlib/mysql-functions1
2 files changed, 9 insertions, 4 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index b1bd51e..7185b97 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -557,10 +557,14 @@ while read -r package_id package_name; do
t
h
s/$/\t>=\t'"${min_version}"'/
- p
- g
- s/$/\t<=\t'"${max_version}"'/
- ' | \
+ '"$(
+ if [ "${lib}" = 'provides' ]; then
+ printf '%s\n' \
+ 'p' \
+ 'g' \
+ 's/$/\t<=\t'"${max_version}"'/'
+ fi
+ )" | \
sed '
s/\(\s[0-9]\+\):\(\S\+\)$/\1\t\2/
t coda
diff --git a/lib/mysql-functions b/lib/mysql-functions
index e3e5e46..2537311 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -350,6 +350,7 @@ mysql_generate_package_metadata() {
p
g
s/$/\t<=\t'"${max_version}"'/
+ /^\S\+depends\s/d
:split_epoch
s/\(\s[0-9]\+\):\(\S\+\)$/\1\t\2/
t