Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions getuto
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ getuto_refresh() {
fi

if (( ${NOW} - ${DAY} >= ${LST} )) ; then
einfo "Updating gnupg keyring for package signatures"
einfo "Updating gnupg keyring for package signatures" >&3

# Always re-import the system keys because it might be our only source of updates
# for e.g. revocations, renewals, etc if we're on a firewalled machine.
Expand All @@ -81,12 +81,8 @@ getuto_refresh() {

touch ${LASTRUNFILE}
else
[[ -n ${QUIET} ]] || einfo "gnupg keyring for package signatures already up-to-date."
[[ -n ${QUIET} ]] || einfo "gnupg keyring for package signatures already up-to-date." >&3
fi

# If we got here, everything is fine. Empty a silly string to keep the grep happy
# on the output of getuto_refresh.
[[ -n ${QUIET} ]] && echo OK || true
}


Expand Down Expand Up @@ -195,11 +191,13 @@ else
# We want to be able to filter error messages
export LC_ALL=C.UTF8

if [[ -n ${QUIET} ]] ; then
getuto_refresh |& grep -qv ": no user ID"
else
getuto_refresh
fi
{
if [[ -n ${QUIET} ]] ; then
getuto_refresh >/dev/null 2>&1
else
getuto_refresh
fi
} 3>&1
fi

# Make sure the trustdb is world-readable (again).
Expand Down
Loading