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

ostadmin: Fix up deploy config logic again 

Clearly we need tests here...
This commit is contained in:
Colin Walters 2012-09-09 11:42:17 -04:00
parent 2f8b3517f4
commit 117b9c109e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,10 +204,9 @@ copy_one_config_file (OtAdminDeploy *self,
ot_lobj GFile *dest = NULL; ot_lobj GFile *dest = NULL;
ot_lobj GFile *parent = NULL; ot_lobj GFile *parent = NULL;
ot_lfree char *relative_path = NULL; ot_lfree char *relative_path = NULL;
ot_lobj GFile *modified_path = NULL;
relative_path = g_file_get_relative_path (orig_etc, src); relative_path = g_file_get_relative_path (modified_etc, src);
modified_path = g_file_resolve_relative_path (modified_etc, relative_path); g_assert (relative_path);
dest = g_file_resolve_relative_path (new_etc, relative_path); dest = g_file_resolve_relative_path (new_etc, relative_path);
parent = g_file_get_parent (dest); parent = g_file_get_parent (dest);
@ -288,15 +287,8 @@ merge_etc_changes (OtAdminDeploy *self,
for (i = 0; i < modified->len; i++) for (i = 0; i < modified->len; i++)
{ {
OstreeDiffItem *diff = modified->pdata[i]; OstreeDiffItem *diff = modified->pdata[i];
ot_lfree char *relative_path = NULL;
ot_lobj GFile *modified_path = NULL;
ot_lobj GFile *target_path = NULL;
relative_path = g_file_get_relative_path (orig_etc, diff->src);
modified_path = g_file_resolve_relative_path (modified_etc, relative_path);
target_path = g_file_resolve_relative_path (new_etc, relative_path);
if (!copy_one_config_file (self, orig_etc, modified_etc, new_etc, diff->src, if (!copy_one_config_file (self, orig_etc, modified_etc, new_etc, diff->target,
cancellable, error)) cancellable, error))
goto out; goto out;
} }