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

compose: Delete dead code that copies aside yum repos

Browse Source 
In 827e711 we stopped running two yum transactions. This means the
code that detects if the repodir exists in the yum installroot will
always return false and the code is dead.
This commit is contained in:
Dusty Mabe 2014-07-27 15:44:59 -04:00 committed by Colin Walters
parent 7ab2325081
commit 48e8c126f2
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/rpmostree-compose-builtin-tree.c
View File

@ -160,7 +160,6 @@ append_string_array_to (JsonObject *object,
typedef struct {
GSSubprocess *process;
GFile *reposdir_path;
GFile *tmp_reposdir_path;
GDataOutputStream *stdin;
/* GDataInputStream *stdout; */
@ -200,16 +199,6 @@ yum_context_close (YumContext *yumctx,
g_clear_object (&yumctx->process);
}
if (yumctx->tmp_reposdir_path)
{
g_print ("Moving yum repos back to %s\n", gs_file_get_path_cached (yumctx->reposdir_path));
if (!gs_file_rename (yumctx->tmp_reposdir_path, yumctx->reposdir_path,
cancellable, error))
goto out;
g_clear_object (&yumctx->reposdir_path);
g_clear_object (&yumctx->tmp_reposdir_path);
}
ret = TRUE;
out:
return ret;
@ -384,7 +373,6 @@ yum_context_new (RpmOstreeTreeComposeContext *self,
GPtrArray *yum_argv = g_ptr_array_new_with_free_func (g_free);
gs_unref_object GSSubprocessContext *context = NULL;
gs_unref_object GSSubprocess *yum_process = NULL;
gs_unref_object GFile *reposdir_path = NULL;
g_ptr_array_add (yum_argv, g_strdup ("yum"));
g_ptr_array_add (yum_argv, g_strdup ("-y"));
@ -417,19 +405,6 @@ yum_context_new (RpmOstreeTreeComposeContext *self,
yumctx = g_new0 (YumContext, 1);
reposdir_path = g_file_resolve_relative_path (yumroot, "etc/yum.repos.d");
/* Hideous workaround for the fact that as soon as yum.repos.d
exists in the install root, yum will prefer it. */
if (g_file_query_exists (reposdir_path, NULL))
{
yumctx->reposdir_path = g_object_ref (reposdir_path);
yumctx->tmp_reposdir_path = g_file_resolve_relative_path (yumroot, "etc/yum.repos.d.tmp");
g_print ("Moving yum repos to %s\n", gs_file_get_path_cached (yumctx->tmp_reposdir_path));
if (!gs_file_rename (reposdir_path, yumctx->tmp_reposdir_path,
cancellable, error))
goto out;
}
{
gs_free char *cmdline = subprocess_context_print_args (context);
g_print ("Starting %s\n", cmdline);