packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade: Don't segfault if there's no previous deployment 

Obviously.
This commit is contained in:
Colin Walters 2013-09-20 09:42:50 -04:00
parent 298625d7f8
commit 0f65d73581
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ostree/ot-admin-builtin-upgrade.c
View File

@ -72,6 +72,12 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
if (!opt_osname) if (!opt_osname)
opt_osname = (char*)ostree_deployment_get_osname (ostree_sysroot_get_booted_deployment (sysroot)); opt_osname = (char*)ostree_deployment_get_osname (ostree_sysroot_get_booted_deployment (sysroot));
merge_deployment = ostree_sysroot_get_merge_deployment (sysroot, opt_osname); merge_deployment = ostree_sysroot_get_merge_deployment (sysroot, opt_osname);
if (merge_deployment == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"No previous deployment for OS '%s'", opt_osname);
goto out;
}
deployment_path = ostree_sysroot_get_deployment_directory (sysroot, merge_deployment); deployment_path = ostree_sysroot_get_deployment_directory (sysroot, merge_deployment);
deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path); deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path);