proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-08 09:13:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use fu_common_vercmp() when the device verfmt is PLAIN

Browse Source 
This fixes the upgrade from 5101AALB to 51H0AALB, which fwupd was comparing as '5101' > '51'.
This commit is contained in:
Richard Hughes 2020-02-13 09:41:57 +00:00
parent 22edab6da8
commit 1de7cc920f
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fu-install-task.c
View File

@ -356,9 +356,14 @@ fu_install_task_check_requirements (FuInstallTask *self,
} }
/* check semver */ /* check semver */
version_release = fu_common_version_parse_from_format (version_release_raw, if (fu_device_get_version_format (self->device) == FWUPD_VERSION_FORMAT_PLAIN) {
fu_device_get_version_format (self->device)); version_release = g_strdup (version_release_raw);
vercmp = fu_common_vercmp (version, version_release); vercmp = g_strcmp0 (version, version_release);
} else {
version_release = fu_common_version_parse_from_format (version_release_raw,
fu_device_get_version_format (self->device));
vercmp = fu_common_vercmp (version, version_release);
}
if (vercmp == 0 && (flags & FWUPD_INSTALL_FLAG_ALLOW_REINSTALL) == 0) { if (vercmp == 0 && (flags & FWUPD_INSTALL_FLAG_ALLOW_REINSTALL) == 0) {
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,

47
src/fu-self-test.c
View File

@ -506,6 +506,51 @@ fu_engine_requirements_device_func (gconstpointer user_data)
g_assert (ret); g_assert (ret);
} }
static void
fu_engine_requirements_device_plain_func (gconstpointer user_data)
{
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new ();
g_autoptr(FuEngine) engine = fu_engine_new (FU_APP_FLAGS_NONE);
g_autoptr(FuInstallTask) task = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(XbNode) component = NULL;
g_autoptr(XbSilo) silo = NULL;
const gchar *xml =
"<component>"
" <provides>"
" <firmware type=\"flashed\">12345678-1234-1234-1234-123456789012</firmware>"
" </provides>"
" <releases>"
" <release version=\"51H0AALB\">"
" <checksum type=\"sha1\" filename=\"bios.bin\" target=\"content\"/>"
" </release>"
" </releases>"
"</component>";
/* set up a dummy device */
fu_device_set_version (device, "5101AALB", FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_vendor_id (device, "FFFF");
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
/* make the component require three things */
silo = xb_silo_new_from_xml (xml, &error);
g_assert_no_error (error);
g_assert_nonnull (silo);
component = xb_silo_query_first (silo, "component", &error);
g_assert_no_error (error);
g_assert_nonnull (component);
/* check this passes */
task = fu_install_task_new (device, component);
ret = fu_engine_check_requirements (engine, task,
FWUPD_INSTALL_FLAG_NONE,
&error);
g_assert_no_error (error);
g_assert (ret);
}
static void static void
fu_engine_requirements_version_format_func (gconstpointer user_data) fu_engine_requirements_version_format_func (gconstpointer user_data)
{ {
@ -3036,6 +3081,8 @@ main (int argc, char **argv)
fu_engine_requirements_unsupported_func); fu_engine_requirements_unsupported_func);
g_test_add_data_func ("/fwupd/engine{requirements-device}", self, g_test_add_data_func ("/fwupd/engine{requirements-device}", self,
fu_engine_requirements_device_func); fu_engine_requirements_device_func);
g_test_add_data_func ("/fwupd/engine{requirements-device-plain}", self,
fu_engine_requirements_device_plain_func);
g_test_add_data_func ("/fwupd/engine{requirements-version-format}", self, g_test_add_data_func ("/fwupd/engine{requirements-version-format}", self,
fu_engine_requirements_version_format_func); fu_engine_requirements_version_format_func);
g_test_add_data_func ("/fwupd/engine{device-auto-parent}", self, g_test_add_data_func ("/fwupd/engine{device-auto-parent}", self,