keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Generate more predictable "id" variables for deployments

Browse Source 
We can't rely on the the GLib hash functions not changing (or being
stable across host systems).  Basically here we have a "stringified"
deployment...it might be simpler to just declare this stable.
This commit is contained in:
Colin Walters 2016-03-01 16:51:16 -05:00
parent 18b9da97ab
commit 6b4becaef3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/daemon/rpmostreed-deployment-utils.c
View File

@ -22,18 +22,18 @@
#include <libglnx.h>
/* Get a currently unique (for this host) identifier for the
* deployment; TODO - adding the deployment timestamp would make it
* persistently unique, needs API in libostree.
*/
char *
rpmostreed_deployment_generate_id (OstreeDeployment *deployment)
{
const char *osname;
guint hash;
g_return_val_if_fail (OSTREE_IS_DEPLOYMENT (deployment), NULL);
osname = ostree_deployment_get_osname (deployment);
hash = ostree_deployment_hash (deployment);
return g_strdup_printf ("%s_%u", osname, hash);
return g_strdup_printf ("%s-%s.%u",
ostree_deployment_get_osname (deployment),
ostree_deployment_get_csum (deployment),
ostree_deployment_get_deployserial (deployment));
}
OstreeDeployment *