Skip to content

Commit 18dac3c

Browse files
committed
One more verify about update
1 parent 1b70c32 commit 18dac3c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

usr/share/biglinux/bigstore-cli/pactrans.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ use_resolve_replacements='--resolve-replacements=provided'
134134

135135
# Verify the transaction and try again with resolve-replacements=provided if needed
136136
echo "Verifying transaction..."
137-
pacinstall_output=$($pacinstall_cmd --print-only --dbsync --yolo --overwrite $use_resolve_replacements $sysupgrade $install_pkgs $remove_pkgs 2>&1 | tee /var/log/pacman-log-complete.pactrans | jq -Rn -f jq/pactrans.jq | tee /var/log/pacman.json)
137+
pacinstall_output=$($pacinstall_cmd --print-only --dbsync --yolo --overwrite $use_resolve_replacements $sysupgrade $install_pkgs $remove_pkgs 2>&1 | grep -v 'is newer than' | tee /var/log/pacman-log-complete.pactrans | jq -Rn -f jq/pactrans.jq | tee /var/log/pacman.json)
138+
139+
if [ -z "$pacinstall_output" ]; then
140+
echo "Verifying package replacements..."
141+
pacinstall_output=$($pacinstall_cmd --print-only --dbsync --yolo --overwrite $sysupgrade $install_pkgs $remove_pkgs 2>&1 | grep -v 'is newer than' | tee /var/log/pacman-log-complete.pactrans | jq -Rn -f jq/pactrans.jq | tee /var/log/pacman.json)
142+
fi
138143

139144
if [ -z "$pacinstall_output" ]; then
140145
echo "nothing to do"

0 commit comments

Comments
 (0)