X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpackage-listing.sh;h=37603259aa83512e9b9f3555bf5ad0f51b9655d7;hb=dbd05cd4100a27a545cc2c7f0388018449d982c3;hp=82ee902bffb424bd95997c6b6d635c8013b222a9;hpb=b7c2eb944f2ca44bb07a1841306dc75e3e8c03bd;p=releng%2Fglobal-jjb.git diff --git a/shell/package-listing.sh b/shell/package-listing.sh index 82ee902b..37603259 100755 --- a/shell/package-listing.sh +++ b/shell/package-listing.sh @@ -28,7 +28,7 @@ DIFF_PACKAGES=/tmp/packages_diff.txt # Swap to creating END_PACKAGES if we are running in a CI job (determined by if # we have a workspace env) or if the starting packages listing already exists. PACKAGES="${START_PACKAGES}" -if ( [ "${workspace}" ] || [ -f "${START_PACKAGES}" ] ) +if [ "${workspace}" ] || [ -f "${START_PACKAGES}" ] then PACKAGES="${END_PACKAGES}" fi @@ -47,7 +47,7 @@ case "${OS_FAMILY}" in ;; esac -if ( [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] ) +if [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] then # ` || true` Ignore exit code because diff exits 1 when there is a diff diff "${START_PACKAGES}" "${END_PACKAGES}" > "${DIFF_PACKAGES}" || true