diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-05-25 19:57:48 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2013-06-09 15:12:32 +0200 |
| commit | 8ba17539a3ec33abc283ca382cca6e59876a0f07 (patch) | |
| tree | b8feb5b0df9013bde28c487be34d5d8ba7b38307 /test/integration/framework | |
| parent | 991e690a693cf3724b815c1fb358aa033af73c03 (diff) | |
fix support for multiple patterns in apt-cache search
Patterns can appear in the name as well as in the description,
they don't have to match all in the name/description only.
Closes: 691453
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/integration/framework b/test/integration/framework index 31b12e8bf..e3e868d45 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -483,6 +483,7 @@ insertpackage() { local VERSION="$4" local DEPENDENCIES="$5" local PRIORITY="${6:-optional}" + local DESCRIPTION="${7}" local ARCHS="" for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do if [ "$arch" = 'all' -o "$arch" = 'none' ]; then @@ -504,11 +505,16 @@ Maintainer: Joe Sixpack <joe@example.org>" >> $FILE echo "Version: $VERSION Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE - echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + echo -n 'Description: ' >> $FILE + if [ -z "$DESCRIPTION" ]; then + echo "an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, YOU did something horribly wrong! They are autogenerated - und used only by testcases for APT and surf no other propose… -" >> $FILE + und used only by testcases for APT and surf no other propose…" >> $FILE + else + echo "$DESCRIPTION" >> $FILE + fi + echo >> $FILE done done } |