Skip to content

sdk-manage: Compare snapshot to recent uninstalled #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from May 3, 2019
Merged

sdk-manage: Compare snapshot to recent uninstalled #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions sdk-setup/src/mb2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,9 @@ GLOBAL OPTIONS
KNOWN ISSUES

Build target snapshot is not reset automatically when the original target is
changed just by removing packages. Package installation or update is needed to
trigger the automatic reset.
changed just by removing packages via plain RPM usage. Either use zypper for
all package operations or use 'mb2 build-requires reset' to ensure snapshot is
reset.
EOF
}

Expand Down
26 changes: 21 additions & 5 deletions sdk-setup/src/sdk-manage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,23 +1578,39 @@ target_snapshot_needs_reset() {

local snapshot_time=
snapshot_time=$(object_config_get "target:$snapshot" "$SNAPSHOT_TIME_KEY") || return
# Convert date to unix seconds
snapshot_time=$(date --date "$snapshot_time" +%s) || return

# Try to avoid querying RPM database as it takes considerable amount of time
tmpfile=$(mktemp) || return
touch --date "$snapshot_time" "$tmpfile" || return
# --date "@value" passes value as unix seconds
touch --date "@$snapshot_time" "$tmpfile" || return
local newer=
newer=$(find "$MER_TARGETS/$original/var/lib/rpm" -newer "$tmpfile" -print -quit) || return
if [[ ! $newer ]]; then
return 1
fi

# TODO how to determine recent package removal?
local most_recent_install_time=
most_recent_install_time=$(set -o pipefail; rpm --root="$MER_TARGETS/$original" -qa \
--queryformat '%{installtime}\n' |sort -n |tail -n1) || return
local snapshot_time_s=$(date --date "$snapshot_time" +%s) || return

(( most_recent_install_time > snapshot_time_s ))
# Compare values in unix seconds
(( most_recent_install_time > snapshot_time )) && return

# The rpm database does not know about the most recent package removal, so
# parse the zypper install log. zypp/history looks like this:
# 2019-02-27 16:39:18|remove |droid-hal-mydevice-tools|0.0.6-201902271629|armv7hl|user@pc|
# But could also look like this:
# 2019-02-27 16:39:18|install|remove-my-pkg|0.0.6-201902271629|armv7hl|user@pc|
local most_recent_removal_time=$(set -o pipefail; \
tac "$MER_TARGETS/$original/var/log/zypp/history" \
|cut -d "|" -f "1,2" \
|grep -m 1 "|remove" \
|cut -d "|" -f 1 \
) || return
most_recent_removal_time=$(date --date "$most_recent_removal_time" +%s) || return
# Compare values in unix seconds
(( most_recent_removal_time > snapshot_time )) && return
}

reserve_target() {
Expand Down