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

deploy: Error out if we see usr/etc 

This version of the code doesn't know what to do with new-model trees,
so just abort if we see that.  We'll likely never care about upgrades
from 1.0 to 2.0.
This commit is contained in:
Colin Walters 2013-07-05 17:29:07 -04:00
parent e8cba55a34
commit ecb3f0de03
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ostree/ot-admin-builtin-deploy.c
View File

@ -509,6 +509,7 @@ deploy_tree (OtAdminDeploy *self,
{ {
ProcessOneCheckoutData checkout_data; ProcessOneCheckoutData checkout_data;
ot_lobj GFile *triggers_run_path = NULL; ot_lobj GFile *triggers_run_path = NULL;
gs_unref_object GFile *usr_etc_path = NULL;
g_print ("ostadmin: Creating deployment %s\n", g_print ("ostadmin: Creating deployment %s\n",
gs_file_get_path_cached (self->deploy_target_path)); gs_file_get_path_cached (self->deploy_target_path));
@ -528,6 +529,14 @@ deploy_tree (OtAdminDeploy *self,
if (checkout_data.caught_error) if (checkout_data.caught_error)
goto out; goto out;
usr_etc_path = g_file_resolve_relative_path (deploy_target_path_tmp, "usr/etc");
if (g_file_query_exists (usr_etc_path, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
"Error: This tree contains usr/etc; it is likely an OS in version 2.0 format, and this version of OSTree does not support it");
goto out;
}
triggers_run_path = g_file_resolve_relative_path (deploy_target_path_tmp, "usr/share/ostree/triggers-run"); triggers_run_path = g_file_resolve_relative_path (deploy_target_path_tmp, "usr/share/ostree/triggers-run");
if (!g_file_query_exists (triggers_run_path, NULL)) if (!g_file_query_exists (triggers_run_path, NULL))