diff options
| author | Bryan Drewery <bryan@shatow.net> | 2022-11-04 22:48:47 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2022-11-05 18:45:14 +0300 |
| commit | d10fcb84b68a54b2967eb34e485fef7c5eaea9c4 (patch) | |
| tree | 93ca78a5e8b064a470e70c1bee81d2f93500eb25 | |
| parent | d39e50622bb73b274e905a7fb12a909ee4435690 (diff) | |
tests assert_ignored: .poudriere.ports.ignored does not guarantee 'ignored' for reason
| -rw-r--r-- | test/common.bulk.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/common.bulk.sh b/test/common.bulk.sh index f0774126..4e338557 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -302,7 +302,7 @@ assert_ignored() { assert_not '' "${pkgname}" "PKGNAME needed for ${originspec}" echo "=> Asserting that ${originspec} | ${pkgname} is ignored" awk -vpkgname="${pkgname}" -voriginspec="${originspec}" ' - $1 == originspec && $2 == pkgname && ($3 == "ignored") { + $1 == originspec && $2 == pkgname && ($3 != "") { print "==> " $0 if (found == 1) { # A duplicate, no good. @@ -319,7 +319,7 @@ assert_ignored() { # is in the queue. cat "${tmp}" | \ awk -vpkgname="${pkgname}" -voriginspec="${originspec}" ' - $1 == originspec && $2 == pkgname && $3 == "ignored" { next } + $1 == originspec && $2 == pkgname && $3 != "" { next } { print } ' > "${tmp}.new" mv -f "${tmp}.new" "${tmp}" |