Fix crash when deploying with implicit os name

When booted into an ostree you can deploy without passing
an --os option. That was crashing though, because
ot_admin_complete_deploy_one is called with NULL
osname but it was not handling it properly.

https://bugzilla.gnome.org/show_bug.cgi?id=710970
This commit is contained in:
Daniel Narvaez authored and Colin Walters committed 2013-10-28 09:15:32 -04:00
1 parent 03aa10f17d
commit 7ecfbff26e
1 file changed
+2 -1
+2 -1
View File
@@ -77,7 +77,8 @@ ot_admin_complete_deploy_one (OstreeSysroot *sysroot,
* booted and merge deployments
*/
if (opt_retain ||
strcmp (ostree_deployment_get_osname (deployment), osname) != 0 ||
(osname != NULL &&
strcmp (ostree_deployment_get_osname (deployment), osname) != 0) ||
ostree_deployment_equal (deployment, booted_deployment) ||
ostree_deployment_equal (deployment, merge_deployment))
{