Skip to content

Fixed simulate diff mode aborting on repeated unversioned package installs #6424

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

Open
djbclark wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −1
Open

Fixed simulate diff mode aborting on repeated unversioned package installs #6424

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: 4 additions & 1 deletion cf-agent/simulate_mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,10 @@ bool DiffPkgOperations()
MapRemove(removed, name_arch);

PkgOperationRecord *prev_record = MapGet(installed, name_arch);
if ((prev_record == NULL) || PkgVersionIsGreater(pkg_ver, prev_record->pkg_ver))
if ((prev_record == NULL) ||
(NULL_OR_EMPTY(prev_record->pkg_ver) && !NULL_OR_EMPTY(pkg_ver)) ||
(!NULL_OR_EMPTY(pkg_ver) && !NULL_OR_EMPTY(prev_record->pkg_ver) &&
PkgVersionIsGreater(pkg_ver, prev_record->pkg_ver)))
{
char *msg = GetPkgOperationMsg(CHROOT_PKG_OPERATION_CODE_INSTALL,
pkg_name, pkg_arch, pkg_ver);
Expand Down
36 changes: 36 additions & 0 deletions tests/unit/simulate_mode_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,40 @@ static void test_manifest_install_cancels_removal(void)
unlink(ToChangesChroot(CHROOT_PKGS_OPS_FILE));
}

/* Two recorded installations of the same package without a version must be
* reported once, not abort on comparing the empty versions. */
static void test_diff_repeated_unversioned_install(void)
{
write_pkgs_ops("i,foo,,\r\n"
"i,foo,,\r\n");

char output[4096];
assert_true(call_with_captured_stdout(&DiffPkgOperations, output, sizeof(output)));

const char *msg = "Package 'foo' would be installed";
const char *first = strstr(output, msg);
assert_true(first != NULL);
assert_true(strstr(first + strlen(msg), "would be installed") == NULL);

unlink(ToChangesChroot(CHROOT_PKGS_OPS_FILE));
}

/* A versioned installation record is more specific than an unversioned one
* of the same package, so it is the one to report. */
static void test_diff_unversioned_then_versioned_install(void)
{
write_pkgs_ops("i,foo,,\r\n"
"i,foo,1.2.3,\r\n");

char output[4096];
assert_true(call_with_captured_stdout(&DiffPkgOperations, output, sizeof(output)));

assert_true(strstr(output, "Package 'foo [1.2.3]' would be installed") != NULL);
assert_true(strstr(output, "Package 'foo' would be installed") == NULL);

unlink(ToChangesChroot(CHROOT_PKGS_OPS_FILE));
}

int main()
{
PRINT_TEST_BANNER();
Expand All @@ -161,6 +195,8 @@ int main()
unit_test(test_diff_removal_with_version),
unit_test(test_diff_removal_with_other_version_keeps_install),
unit_test(test_manifest_install_cancels_removal),
unit_test(test_diff_repeated_unversioned_install),
unit_test(test_diff_unversioned_then_versioned_install),
};

int ret = run_tests(tests);
Expand Down
Loading