X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpackage-listing.sh;h=37603259aa83512e9b9f3555bf5ad0f51b9655d7;hb=e50da79e348b4302edf4f2cc2ed4842830f9cc54;hp=b2afe33a4105ea758a4172cc63828ad2d196ea00;hpb=e154622c6324f2b4a9db3970c074254649d5eaf3;p=releng%2Fglobal-jjb.git diff --git a/shell/package-listing.sh b/shell/package-listing.sh old mode 100644 new mode 100755 index b2afe33a..37603259 --- 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,9 +47,10 @@ case "${OS_FAMILY}" in ;; esac -if ( [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] ) +if [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] then - diff "${START_PACKAGES}" "${END_PACKAGES}" > "${DIFF_PACKAGES}" + # ` || true` Ignore exit code because diff exits 1 when there is a diff + diff "${START_PACKAGES}" "${END_PACKAGES}" > "${DIFF_PACKAGES}" || true fi # If running in a Jenkins job, then copy the created files to the archives